Commit c122cdb2 authored by henry's avatar henry Committed by Beatriz Rizental
Browse files

BB 42831: Remove the shopping components.

parent cc700e66

browser/base/content/browser-main.js

+1 −1
Changes for browser/base/content/browser-main.js: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -29,7 +29,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);

browser/base/content/browser.js

+2 −6
Changes for browser/base/content/browser.js: 2 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ ChromeUtils.defineESModuleGetters(this, { 
  SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",

  SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",

  SharingUtils: "resource:///modules/SharingUtils.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",
@@ -2967,10 +2967,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 −2
Changes for browser/base/content/browser.js.globals: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ 
  "SessionStartup",

  "SessionStore",

  "SharingUtils",

  "ShoppingSidebarParent",

  "ShoppingSidebarManager",

  "ShortcutUtils",

  "SiteDataManager",

  "SitePermissions",

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

+2 −0
Changes for browser/base/content/navigator-toolbox.inc.xhtml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -391,6 +391,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"

browser/components/BrowserComponents.manifest

+0 −2
Changes for browser/components/BrowserComponents.manifest: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ category browser-idle-startup moz-src:///browser/components/tabbrowser/TabUnload 
category browser-idle-startup resource:///modules/GenAI.sys.mjs GenAI.init

category browser-idle-startup resource:///modules/QuickSuggest.sys.mjs QuickSuggest.init

category browser-idle-startup resource:///modules/UrlbarSearchTermsPersistence.sys.mjs UrlbarSearchTermsPersistence.init

category browser-idle-startup resource:///modules/ShoppingUtils.sys.mjs ShoppingUtils.init

category browser-idle-startup moz-src:///browser/components/search/SERPCategorization.sys.mjs SERPCategorization.init

category browser-idle-startup resource://gre/modules/ContentRelevancyManager.sys.mjs ContentRelevancyManager.init

#ifdef MOZ_UPDATER
@@ -61,7 +60,6 @@ category browser-quit-application-granted resource://gre/modules/PageThumbs.sys. 
category browser-quit-application-granted resource://gre/modules/NewTabUtils.sys.mjs NewTabUtils.uninit

category browser-quit-application-granted resource://normandy/Normandy.sys.mjs Normandy.uninit

category browser-quit-application-granted resource://gre/modules/RFPHelper.sys.mjs RFPHelper.uninit

category browser-quit-application-granted resource:///modules/ShoppingUtils.sys.mjs ShoppingUtils.uninit

category browser-quit-application-granted resource:///modules/asrouter/ASRouterNewTabHook.sys.mjs ASRouterNewTabHook.destroy

category browser-quit-application-granted moz-src:///browser/components/search/SERPCategorization.sys.mjs SERPCategorization.uninit

category browser-quit-application-granted moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs SearchSERPTelemetry.uninit