Verified Commit 510b949e authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

Bug 42831: Remove the shopping components.

parent e0319323

browser/base/content/browser-init.js

+0 −2
Original line number Diff line number Diff line
@@ -604,8 +604,6 @@ var gBrowserInit = { 


    CaptivePortalWatcher.delayedStartup();



    ShoppingSidebarManager.ensureInitialized();



    SessionStore.promiseAllWindowsRestored.then(() => {

      this._schedulePerWindowIdleTasks();

      document.documentElement.setAttribute("sessionrestored", "true");

browser/base/content/browser.js

+3 −7
Original line number Diff line number Diff line
@@ -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",
@@ -72,8 +72,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",
@@ -4331,10 +4331,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) {

browser/base/content/browser.js.globals

+0 −3
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ 
  "E10SUtils",

  "ExtensionsUI",

  "HomePage",

  "isProductURL",

  "LightweightThemeConsumer",

  "LoginHelper",

  "LoginManagerParent",
@@ -162,8 +161,6 @@ 
  "SearchUIUtils",

  "SessionStartup",

  "SessionStore",

  "ShoppingSidebarParent",

  "ShoppingSidebarManager",

  "ShortcutUtils",

  "SiteDataManager",

  "SitePermissions",

browser/base/content/browser.xhtml

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,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.



  window.onload = gBrowserInit.onLoad.bind(gBrowserInit);

  window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);

browser/base/content/navigator-toolbox.inc.xhtml

+2 −0
Original line number Diff line number Diff line
@@ -380,6 +380,8 @@ 
                <image class="urlbar-icon" id="translations-button-circle-arrows" />

                <html:span id="translations-button-locale" aria-hidden="true" />

              </hbox>

              <!-- #shopping-sidebar-button should remain hidden.

                 - tor-browser#42831. -->

              <hbox id="shopping-sidebar-button"

                  class="urlbar-page-action"

                  role="button"