diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 3e3e0b9fc4d3..e615a84b55b0 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -3024,6 +3024,3 @@ pref("browser.mailto.dualPrompt.os", false); pref("browser.mailto.prompt.os", true); pref("browser.backup.enabled", false); - -// Pref to enable the new profiles -pref("browser.profiles.enabled", false); diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 6000ac68eae6..4443fe72d401 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -717,7 +717,6 @@ var gInitialPages = [ "about:welcome", "about:welcomeback", "chrome://browser/content/blanktab.html", - "about:profilemanager", ]; function isInitialPage(url) { diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs index 5817c6ceb3b7..80750b6a9fe8 100644 --- a/browser/components/BrowserGlue.sys.mjs +++ b/browser/components/BrowserGlue.sys.mjs @@ -674,17 +674,6 @@ let JSWINDOWACTORS = { allFrames: true, }, - Profiles: { - parent: { - esModuleURI: "resource:///actors/ProfilesParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/ProfilesChild.sys.mjs", - }, - matches: ["about:profilemanager"], - enablePreference: "browser.profiles.enabled", - }, - Prompt: { parent: { esModuleURI: "resource:///actors/PromptParent.sys.mjs", diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index 425e4ac3cf45..46e9a6a82108 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -163,10 +163,6 @@ static const RedirEntry kRedirMap[] = { {"ion", "chrome://browser/content/ion.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"profilemanager", "chrome://browser/content/profiles/profiles.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | - nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS}, }; static nsAutoCString GetAboutModuleName(nsIURI* aURI) { diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf index 2d080845925e..b94c49b61dc2 100644 --- a/browser/components/about/components.conf +++ b/browser/components/about/components.conf @@ -25,7 +25,6 @@ pages = [ 'preferences', 'privatebrowsing', 'protections', - 'profilemanager', 'profiling', 'reader', 'restartrequired', diff --git a/browser/components/moz.build b/browser/components/moz.build index 53057c9efa36..5d0d587c3108 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -51,7 +51,6 @@ DIRS += [ "pocket", "preferences", "privatebrowsing", - "profiles", "prompts", "protections", "protocolhandler", diff --git a/browser/components/profiles/ProfilesChild.sys.mjs b/browser/components/profiles/ProfilesChild.sys.mjs deleted file mode 100644 index 5ea9ceaa2764..000000000000 --- a/browser/components/profiles/ProfilesChild.sys.mjs +++ /dev/null @@ -1,5 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -export class ProfilesChild extends JSWindowActorParent {} diff --git a/browser/components/profiles/ProfilesParent.sys.mjs b/browser/components/profiles/ProfilesParent.sys.mjs deleted file mode 100644 index 4e2e094ff3e4..000000000000 --- a/browser/components/profiles/ProfilesParent.sys.mjs +++ /dev/null @@ -1,5 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -export class ProfilesParent extends JSWindowActorParent {} diff --git a/browser/components/profiles/content/profiles.html b/browser/components/profiles/content/profiles.html deleted file mode 100644 index ec0021c71388..000000000000 --- a/browser/components/profiles/content/profiles.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - -

Hello world - New Profiles

- - diff --git a/browser/components/profiles/jar.mn b/browser/components/profiles/jar.mn deleted file mode 100644 index 3cec31e46268..000000000000 --- a/browser/components/profiles/jar.mn +++ /dev/null @@ -1,6 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -browser.jar: - content/browser/profiles/profiles.html (content/profiles.html) diff --git a/browser/components/profiles/moz.build b/browser/components/profiles/moz.build deleted file mode 100644 index 8e9e82db2c2d..000000000000 --- a/browser/components/profiles/moz.build +++ /dev/null @@ -1,15 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -JAR_MANIFESTS += ["jar.mn"] - -FINAL_TARGET_FILES.actors += [ - "ProfilesChild.sys.mjs", - "ProfilesParent.sys.mjs", -] - -with Files("**"): - BUG_COMPONENT = ("Firefox", "Profiles")