corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1965072: Migrate ProfilesDatastoreService to toolkit. r=profiles-reviewers,firefox-desktop-core-reviewers ,mconley,jhirsch

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D249739
This commit is contained in:
Dave Townsend
2025-05-21 14:45:43 +00:00
committed by dtownsend@mozilla.com
parent 023857f56b
commit 8dd59e9654
10 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/browser.js
View File

@@ -68,7 +68,7 @@ ChromeUtils.defineESModuleGetters(this, {
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.sys.mjs",
ProfilesDatastoreService:
"resource:///modules/profiles/ProfilesDatastoreService.sys.mjs",
"moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs",
PromptUtils: "resource://gre/modules/PromptUtils.sys.mjs",
ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
ResetPBMPanel: "resource:///modules/ResetPBMPanel.sys.mjs",

2
browser/components/BrowserGlue.sys.mjs
View File

@@ -66,7 +66,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
ProfileDataUpgrader:
"moz-src:///browser/components/ProfileDataUpgrader.sys.mjs",
ProfilesDatastoreService:
"resource:///modules/profiles/ProfilesDatastoreService.sys.mjs",
"moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs",
RemoteSecuritySettings:
"resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",

2
browser/components/profiles/SelectableProfile.sys.mjs
View File

@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import { ProfilesDatastoreService } from "resource:///modules/profiles/ProfilesDatastoreService.sys.mjs";
import { ProfilesDatastoreService } from "moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs";
import { SelectableProfileService } from "resource:///modules/profiles/SelectableProfileService.sys.mjs";
/**

2
browser/components/profiles/SelectableProfileService.sys.mjs
View File

@@ -5,7 +5,7 @@
import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
import { DeferredTask } from "resource://gre/modules/DeferredTask.sys.mjs";
import { EventEmitter } from "resource://gre/modules/EventEmitter.sys.mjs";
import { ProfilesDatastoreService } from "resource:///modules/profiles/ProfilesDatastoreService.sys.mjs";
import { ProfilesDatastoreService } from "moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs";
import { SelectableProfile } from "resource:///modules/profiles/SelectableProfile.sys.mjs";
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";

1
browser/components/profiles/moz.build
View File

@@ -15,7 +15,6 @@ FINAL_TARGET_FILES.actors += [
]
EXTRA_JS_MODULES.profiles += [
"ProfilesDatastoreService.sys.mjs",
"SelectableProfile.sys.mjs",
"SelectableProfileService.sys.mjs",
]

2
browser/components/profiles/tests/unit/head.js
View File

@@ -23,7 +23,7 @@ ChromeUtils.defineLazyGetter(lazy, "SelectableProfileService", () => {
ChromeUtils.defineLazyGetter(lazy, "ProfilesDatastoreService", () => {
const { ProfilesDatastoreService } = ChromeUtils.importESModule(
"resource:///modules/profiles/ProfilesDatastoreService.sys.mjs"
"moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs"
);
ProfilesDatastoreService.overrideDirectoryService({

5
browser/components/profiles/ProfilesDatastoreService.sys.mjs → toolkit/profile/ProfilesDatastoreService.sys.mjs
View File

@@ -14,6 +14,11 @@ ChromeUtils.defineESModuleGetters(lazy, {
Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
});
/**
* An API that allows access to the cross-profile SQLite database shared
* between a group of profiles. This database always exists, even if the
* user does not have the multiple profiles feature enabled.
*/
class ProfilesDatastoreServiceClass {
#connection = null;
#asyncShutdownBlocker = null;

4
toolkit/profile/moz.build
View File

@@ -18,6 +18,10 @@ XPIDL_SOURCES += [
"nsIToolkitProfileService.idl",
]
MOZ_SRC_FILES += [
"ProfilesDatastoreService.sys.mjs",
]
XPIDL_MODULE = "toolkitprofile"
EXPORTS += ["nsProfileLock.h"]

2
tools/@types/generated/lib.gecko.modules.d.ts vendored
View File

@@ -238,6 +238,7 @@ export interface LazyModules {
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs": typeof import("moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs"),
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs": typeof import("moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs"),
"moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs": typeof import("moz-src:///toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs"),
"moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs": typeof import("moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs"),
"resource:///actors/AboutNewTabParent.sys.mjs": typeof import("resource:///actors/AboutNewTabParent.sys.mjs"),
"resource:///actors/AboutReaderParent.sys.mjs": typeof import("resource:///actors/AboutReaderParent.sys.mjs"),
"resource:///actors/AboutWelcomeParent.sys.mjs": typeof import("resource:///actors/AboutWelcomeParent.sys.mjs"),
@@ -404,7 +405,6 @@ export interface LazyModules {
"resource:///modules/policies/ProxyPolicies.sys.mjs": typeof import("resource:///modules/policies/ProxyPolicies.sys.mjs"),
"resource:///modules/policies/WebsiteFilter.sys.mjs": typeof import("resource:///modules/policies/WebsiteFilter.sys.mjs"),
"resource:///modules/policies/schema.sys.mjs": typeof import("resource:///modules/policies/schema.sys.mjs"),
"resource:///modules/profiles/ProfilesDatastoreService.sys.mjs": typeof import("resource:///modules/profiles/ProfilesDatastoreService.sys.mjs"),
"resource:///modules/profiles/SelectableProfileService.sys.mjs": typeof import("resource:///modules/profiles/SelectableProfileService.sys.mjs"),
"resource:///modules/sessionstore/PageWireframes.sys.mjs": typeof import("resource:///modules/sessionstore/PageWireframes.sys.mjs"),
"resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.sys.mjs": typeof import("resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.sys.mjs"),

6
tools/@types/generated/tspaths.json
View File

@@ -1580,9 +1580,6 @@
"resource:///modules/policies/schema.sys.mjs": [
"tools/@types/subs/schema.sys.d.mts"
],
"resource:///modules/profiles/ProfilesDatastoreService.sys.mjs": [
"browser/components/profiles/ProfilesDatastoreService.sys.mjs"
],
"resource:///modules/profiles/SelectableProfile.sys.mjs": [
"browser/components/profiles/SelectableProfile.sys.mjs"
],
@@ -5687,6 +5684,9 @@
"resource://gre/modules/CustomElementsListener.sys.mjs": [
"toolkit/components/processsingleton/CustomElementsListener.sys.mjs"
],
"resource://gre/modules/DAPReportController.sys.mjs": [
"toolkit/components/telemetry/dap/DAPReportController.sys.mjs"
],
"resource://gre/modules/DAPTelemetrySender.sys.mjs": [
"toolkit/components/telemetry/dap/DAPTelemetrySender.sys.mjs"
],