diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js index 1799bc25ccf72..5768a5ddd0a4c 100644 --- a/browser/base/content/browser-init.js +++ b/browser/base/content/browser-init.js @@ -613,8 +613,6 @@ var gBrowserInit = { CaptivePortalWatcher.delayedStartup(); - ShoppingSidebarManager.ensureInitialized(); - SessionStore.promiseAllWindowsRestored.then(() => { this._schedulePerWindowIdleTasks(); document.documentElement.setAttribute("sessionrestored", "true"); diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 4e14670a498e1..6eee36cddbb2b 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -39,7 +39,7 @@ ChromeUtils.defineESModuleGetters(this, { E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", ExtensionsUI: "resource:///modules/ExtensionsUI.sys.mjs", HomePage: "resource:///modules/HomePage.sys.mjs", - isProductURL: "chrome://global/content/shopping/ShoppingProduct.mjs", + // Removed isProductURL from ShoppingProduct.mjs. tor-browser#42831. LightweightThemeConsumer: "resource://gre/modules/LightweightThemeConsumer.sys.mjs", LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs", @@ -71,8 +71,8 @@ ChromeUtils.defineESModuleGetters(this, { SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", - ShoppingSidebarParent: "resource:///actors/ShoppingSidebarParent.sys.mjs", - ShoppingSidebarManager: "resource:///actors/ShoppingSidebarParent.sys.mjs", + // Removed ShoppingSidebarParent and ShoppingSidebarManager. + // tor-browser#42831. ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", SiteDataManager: "resource:///modules/SiteDataManager.sys.mjs", SitePermissions: "resource:///modules/SitePermissions.sys.mjs", @@ -4340,10 +4340,6 @@ var TabsProgressListener = { return; } - // Some shops use pushState to move between individual products, so - // the shopping code needs to be told about all of these. - ShoppingSidebarManager.onLocationChange(aBrowser, aLocationURI, aFlags); - // Filter out location changes caused by anchor navigation // or history.push/pop/replaceState. if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) { diff --git a/browser/base/content/browser.js.globals b/browser/base/content/browser.js.globals index 95c5318f43e75..18e9bbeebf280 100644 --- a/browser/base/content/browser.js.globals +++ b/browser/base/content/browser.js.globals @@ -130,7 +130,6 @@ "E10SUtils", "ExtensionsUI", "HomePage", - "isProductURL", "LightweightThemeConsumer", "LoginHelper", "LoginManagerParent", @@ -161,8 +160,6 @@ "SearchUIUtils", "SessionStartup", "SessionStore", - "ShoppingSidebarParent", - "ShoppingSidebarManager", "ShortcutUtils", "SiteDataManager", "SitePermissions", diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml index 6689bc89487be..7e24fb3da0d12 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml @@ -127,7 +127,7 @@ Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this); + // Removed shopping-sidebar.js. tor-browser#42831. Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml index 8cf06697bc664..b13922707ac11 100644 --- a/browser/base/content/navigator-toolbox.inc.xhtml +++ b/browser/base/content/navigator-toolbox.inc.xhtml @@ -380,6 +380,8 @@