morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits:

12 changed files:

Changes:

  • browser/base/content/browser-init.js
    ... ... @@ -613,8 +613,6 @@ var gBrowserInit = {
    613 613
    614 614 
         CaptivePortalWatcher.delayedStartup();
    615 615
    616 
    -    ShoppingSidebarManager.ensureInitialized();
    617 
    -
    618 616 
         SessionStore.promiseAllWindowsRestored.then(() => {
    619 617 
           this._schedulePerWindowIdleTasks();
    620 618 
           document.documentElement.setAttribute("sessionrestored", "true");

  • browser/base/content/browser.js
    ... ... @@ -39,7 +39,7 @@ ChromeUtils.defineESModuleGetters(this, {
    39 39 
       E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
    40 40 
       ExtensionsUI: "resource:///modules/ExtensionsUI.sys.mjs",
    41 41 
       HomePage: "resource:///modules/HomePage.sys.mjs",
    42 
    -  isProductURL: "chrome://global/content/shopping/ShoppingProduct.mjs",
    42 
    +  // Removed isProductURL from ShoppingProduct.mjs. tor-browser#42831.
    43 43 
       LightweightThemeConsumer:
    44 44 
         "resource://gre/modules/LightweightThemeConsumer.sys.mjs",
    45 45 
       LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
    ... ... @@ -71,8 +71,8 @@ ChromeUtils.defineESModuleGetters(this, {
    71 71 
       SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs",
    72 72 
       SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
    73 73 
       SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
    74 
    -  ShoppingSidebarParent: "resource:///actors/ShoppingSidebarParent.sys.mjs",
    75 
    -  ShoppingSidebarManager: "resource:///actors/ShoppingSidebarParent.sys.mjs",
    74 
    +  // Removed ShoppingSidebarParent and ShoppingSidebarManager.
    75 
    +  // tor-browser#42831.
    76 76 
       ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
    77 77 
       SiteDataManager: "resource:///modules/SiteDataManager.sys.mjs",
    78 78 
       SitePermissions: "resource:///modules/SitePermissions.sys.mjs",
    ... ... @@ -4338,10 +4338,6 @@ var TabsProgressListener = {
    4338 4338 
           return;
    4339 4339 
         }
    4340 4340
    4341 
    -    // Some shops use pushState to move between individual products, so
    4342 
    -    // the shopping code needs to be told about all of these.
    4343 
    -    ShoppingSidebarManager.onLocationChange(aBrowser, aLocationURI, aFlags);
    4344 
    -
    4345 4341 
         // Filter out location changes caused by anchor navigation
    4346 4342 
         // or history.push/pop/replaceState.
    4347 4343 
         if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) {

  • browser/base/content/browser.js.globals
    ... ... @@ -130,7 +130,6 @@
    130 130 
       "E10SUtils",
    131 131 
       "ExtensionsUI",
    132 132 
       "HomePage",
    133 
    -  "isProductURL",
    134 133 
       "LightweightThemeConsumer",
    135 134 
       "LoginHelper",
    136 135 
       "LoginManagerParent",
    ... ... @@ -161,8 +160,6 @@
    161 160 
       "SearchUIUtils",
    162 161 
       "SessionStartup",
    163 162 
       "SessionStore",
    164 
    -  "ShoppingSidebarParent",
    165 
    -  "ShoppingSidebarManager",
    166 163 
       "ShortcutUtils",
    167 164 
       "SiteDataManager",
    168 165 
       "SitePermissions",

  • browser/base/content/browser.xhtml
    ... ... @@ -127,7 +127,7 @@
    127 127 
       Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this);
    128 128 
       Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);
    129 129 
       Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
    130 
    -  Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this);
    130 
    +  // Removed shopping-sidebar.js. tor-browser#42831.
    131 131 
       Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this);
    132 132
    133 133 
       window.onload = gBrowserInit.onLoad.bind(gBrowserInit);

  • browser/base/content/navigator-toolbox.inc.xhtml
    ... ... @@ -380,6 +380,8 @@
    380 380 
                     <image class="urlbar-icon" id="translations-button-circle-arrows" />
    381 381 
                     <html:span id="translations-button-locale" aria-hidden="true" />
    382 382 
                   </hbox>
    383 
    +              <!-- #shopping-sidebar-button should remain hidden.
    384 
    +                 - tor-browser#42831. -->
    383 385 
                   <hbox id="shopping-sidebar-button"
    384 386 
                       class="urlbar-page-action"
    385 387 
                       role="button"

  • browser/components/BrowserGlue.sys.mjs
    ... ... @@ -86,7 +86,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
    86 86 
       SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
    87 87 
       ShellService: "resource:///modules/ShellService.sys.mjs",
    88 88 
       ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
    89 
    -  ShoppingUtils: "resource:///modules/ShoppingUtils.sys.mjs",
    89 
    +  // Removed ShoppingUtils. tor-browser#42831.
    90 90 
       SpecialMessageActions:
    91 91 
         "resource://messaging-system/lib/SpecialMessageActions.sys.mjs",
    92 92 
       TRRRacer: "resource:///modules/TRRPerformance.sys.mjs",
    ... ... @@ -500,19 +500,7 @@ let JSWINDOWACTORS = {
    500 500 
         matches: ["about:tabcrashed*"],
    501 501 
       },
    502 502
    503 
    -  AboutWelcomeShopping: {
    504 
    -    parent: {
    505 
    -      esModuleURI: "resource:///actors/AboutWelcomeParent.sys.mjs",
    506 
    -    },
    507 
    -    child: {
    508 
    -      esModuleURI: "resource:///actors/AboutWelcomeChild.sys.mjs",
    509 
    -      events: {
    510 
    -        Update: {},
    511 
    -      },
    512 
    -    },
    513 
    -    matches: ["about:shoppingsidebar"],
    514 
    -    remoteTypes: ["privilegedabout"],
    515 
    -  },
    503 
    +  // Removed AboutWelcomeShopping. tor-browser#42831.
    516 504
    517 505 
       AboutWelcome: {
    518 506 
         parent: {
    ... ... @@ -909,27 +897,7 @@ let JSWINDOWACTORS = {
    909 897 
         matches: ["about:studies*"],
    910 898 
       },
    911 899
    912 
    -  ShoppingSidebar: {
    913 
    -    parent: {
    914 
    -      esModuleURI: "resource:///actors/ShoppingSidebarParent.sys.mjs",
    915 
    -    },
    916 
    -    child: {
    917 
    -      esModuleURI: "resource:///actors/ShoppingSidebarChild.sys.mjs",
    918 
    -      events: {
    919 
    -        ContentReady: { wantUntrusted: true },
    920 
    -        PolledRequestMade: { wantUntrusted: true },
    921 
    -        // This is added so the actor instantiates immediately and makes
    922 
    -        // methods available to the page js on load.
    923 
    -        DOMDocElementInserted: {},
    924 
    -        ReportProductAvailable: { wantUntrusted: true },
    925 
    -        AdClicked: { wantUntrusted: true },
    926 
    -        AdImpression: { wantUntrusted: true },
    927 
    -        DisableShopping: { wantUntrusted: true },
    928 
    -      },
    929 
    -    },
    930 
    -    matches: ["about:shoppingsidebar"],
    931 
    -    remoteTypes: ["privilegedabout"],
    932 
    -  },
    900 
    +  // Removed ShoppingSidebar. tor-browser#42831.
    933 901
    934 902 
       SpeechDispatcher: {
    935 903 
         parent: {
    ... ... @@ -2295,7 +2263,6 @@ BrowserGlue.prototype = {
    2295 2263 
             }
    2296 2264 
           },
    2297 2265 
           () => lazy.RFPHelper.uninit(),
    2298 
    -      () => lazy.ShoppingUtils.uninit(),
    2299 2266 
           () => {
    2300 2267 
             if (AppConstants.MOZ_UPDATER) {
    2301 2268 
               lazy.UpdateListener.reset();
    ... ... @@ -3253,13 +3220,6 @@ BrowserGlue.prototype = {
    3253 3220 
             },
    3254 3221 
           },
    3255 3222
    3256 
    -      {
    3257 
    -        name: "ShoppingUtils.init",
    3258 
    -        task: () => {
    3259 
    -          lazy.ShoppingUtils.init();
    3260 
    -        },
    3261 
    -      },
    3262 
    -
    3263 3223 
           {
    3264 3224 
             // Starts the JSOracle process for ORB JavaScript validation, if it hasn't started already.
    3265 3225 
             name: "start-orb-javascript-oracle",

  • browser/components/about/AboutRedirector.cpp
    ... ... @@ -92,12 +92,7 @@ static const RedirEntry kRedirMap[] = {
    92 92 
         {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml",
    93 93 
          nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT |
    94 94 
              nsIAboutModule::IS_SECURE_CHROME_UI},
    95 
    -    {"shoppingsidebar", "chrome://browser/content/shopping/shopping.html",
    96 
    -     nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
    97 
    -         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
    98 
    -         nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    99 
    -         nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT |
    100 
    -         nsIAboutModule::IS_SECURE_CHROME_UI},
    95 
    +    // Removed about:shoppingsidebar. tor-browser#42831.
    101 96 
         {"tabcrashed", "chrome://browser/content/aboutTabCrashed.xhtml",
    102 97 
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    103 98 
              nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},

  • browser/components/about/components.conf
    ... ... @@ -26,7 +26,7 @@ pages = [
    26 26 
         'robots',
    27 27 
         'sessionrestore',
    28 28 
         'settings',
    29 
    -    'shoppingsidebar',
    29 
    +    # Removed 'shoppingsidebar'. tor-browser#42831.
    30 30 
         'tabcrashed',
    31 31 
         'unloads',
    32 32 
         'welcome',

  • browser/components/shopping/jar.mn
    ... ... @@ -2,30 +2,4 @@
    2 2 
     # License, v. 2.0. If a copy of the MPL was not distributed with this
    3 3 
     # file, You can obtain one at http://mozilla.org/MPL/2.0/.
    4 4
    5 
    -browser.jar:
    6 
    -    content/browser/shopping/onboarding.mjs (content/onboarding.mjs)
    7 
    -    content/browser/shopping/shopping.html (content/shopping.html)
    8 
    -    content/browser/shopping/shopping-container.css (content/shopping-container.css)
    9 
    -    content/browser/shopping/shopping-page.css (content/shopping-page.css)
    10 
    -    content/browser/shopping/shopping-sidebar.js (content/shopping-sidebar.js)
    11 
    -    content/browser/shopping/shopping-message-bar.css (content/shopping-message-bar.css)
    12 
    -    content/browser/shopping/shopping-message-bar.mjs (content/shopping-message-bar.mjs)
    13 
    -    content/browser/shopping/highlights.mjs (content/highlights.mjs)
    14 
    -    content/browser/shopping/highlight-item.css (content/highlight-item.css)
    15 
    -    content/browser/shopping/highlight-item.mjs (content/highlight-item.mjs)
    16 
    -    content/browser/shopping/shopping-card.css (content/shopping-card.css)
    17 
    -    content/browser/shopping/shopping-card.mjs (content/shopping-card.mjs)
    18 
    -    content/browser/shopping/letter-grade.css (content/letter-grade.css)
    19 
    -    content/browser/shopping/letter-grade.mjs (content/letter-grade.mjs)
    20 
    -    content/browser/shopping/settings.mjs (content/settings.mjs)
    21 
    -    content/browser/shopping/settings.css (content/settings.css)
    22 
    -    content/browser/shopping/shopping-container.mjs (content/shopping-container.mjs)
    23 
    -    content/browser/shopping/adjusted-rating.mjs (content/adjusted-rating.mjs)
    24 
    -    content/browser/shopping/reliability.mjs (content/reliability.mjs)
    25 
    -    content/browser/shopping/analysis-explainer.css (content/analysis-explainer.css)
    26 
    -    content/browser/shopping/analysis-explainer.mjs (content/analysis-explainer.mjs)
    27 
    -    content/browser/shopping/unanalyzed.css (content/unanalyzed.css)
    28 
    -    content/browser/shopping/unanalyzed.mjs (content/unanalyzed.mjs)
    29 
    -    content/browser/shopping/recommended-ad.css (content/recommended-ad.css)
    30 
    -    content/browser/shopping/recommended-ad.mjs (content/recommended-ad.mjs)
    31 
    -    content/browser/shopping/assets/ (content/assets/*)
    5 
    +# Removed desktop shopping-sidebar content. tor-browser#42831.

  • browser/components/shopping/moz.build
    ... ... @@ -6,14 +6,8 @@
    6 6
    7 7 
     JAR_MANIFESTS += ["jar.mn"]
    8 8
    9 
    -FINAL_TARGET_FILES.actors += [
    10 
    -    "ShoppingSidebarChild.sys.mjs",
    11 
    -    "ShoppingSidebarParent.sys.mjs",
    12 
    -]
    13 
    -
    14 
    -EXTRA_JS_MODULES += [
    15 
    -    "ShoppingUtils.sys.mjs",
    16 
    -]
    9 
    +# Removed ShoppingSidebarParent, ShoppingSidebarChild and ShoppingUtils.
    10 
    +# tor-browser#42831.
    17 11
    18 12 
     BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"]
    19 13

  • toolkit/components/shopping/jar.mn
    ... ... @@ -2,19 +2,4 @@
    2 2 
     # License, v. 2.0. If a copy of the MPL was not distributed with this
    3 3 
     # file, You can obtain one at http://mozilla.org/MPL/2.0/.
    4 4
    5 
    -toolkit.jar:
    6 
    -  content/global/shopping/ProductConfig.mjs (content/ProductConfig.mjs)
    7 
    -  content/global/shopping/ProductValidator.sys.mjs (content/ProductValidator.sys.mjs)
    8 
    -  content/global/shopping/ShoppingProduct.mjs (content/ShoppingProduct.mjs)
    9 
    -  content/global/shopping/analysis_response.schema.json (schemas/analysis_response.schema.json)
    10 
    -  content/global/shopping/recommendations_response.schema.json (schemas/recommendations_response.schema.json)
    11 
    -  content/global/shopping/analysis_request.schema.json (schemas/analysis_request.schema.json)
    12 
    -  content/global/shopping/recommendations_request.schema.json (schemas/recommendations_request.schema.json)
    13 
    -  content/global/shopping/attribution_response.schema.json (schemas/attribution_response.schema.json)
    14 
    -  content/global/shopping/attribution_request.schema.json (schemas/attribution_request.schema.json)
    15 
    -  content/global/shopping/reporting_response.schema.json (schemas/reporting_response.schema.json)
    16 
    -  content/global/shopping/reporting_request.schema.json (schemas/reporting_request.schema.json)
    17 
    -  content/global/shopping/analysis_status_request.schema.json (schemas/analysis_status_request.schema.json)
    18 
    -  content/global/shopping/analysis_status_response.schema.json (schemas/analysis_status_response.schema.json)
    19 
    -  content/global/shopping/analyze_request.schema.json (schemas/analyze_request.schema.json)
    20 
    -  content/global/shopping/analyze_response.schema.json (schemas/analyze_response.schema.json)
    5 
    +# Removed ShoppingProduct modules and schema JSONs. tor-browser#42831.

  • toolkit/modules/RemotePageAccessManager.sys.mjs
    ... ... @@ -216,21 +216,7 @@ export let RemotePageAccessManager = {
    216 216 
           ],
    217 217 
           RPMRecordTelemetryEvent: ["*"],
    218 218 
         },
    219 
    -    "about:shoppingsidebar": {
    220 
    -      RPMSetPref: [
    221 
    -        "browser.shopping.experience2023.optedIn",
    222 
    -        "browser.shopping.experience2023.active",
    223 
    -        "browser.shopping.experience2023.ads.userEnabled",
    224 
    -        "browser.shopping.experience2023.sidebarClosedCount",
    225 
    -        "browser.shopping.experience2023.showKeepSidebarClosedMessage",
    226 
    -        "browser.shopping.experience2023.autoOpen.userEnabled",
    227 
    -      ],
    228 
    -      RPMGetFormatURLPref: ["app.support.baseURL"],
    229 
    -      RPMGetIntPref: ["browser.shopping.experience2023.sidebarClosedCount"],
    230 
    -      RPMGetBoolPref: [
    231 
    -        "browser.shopping.experience2023.showKeepSidebarClosedMessage",
    232 
    -      ],
    233 
    -    },
    219 
    +    // Removed about:shoppingsidebar. tor-browser#42831.
    234 220 
         "about:tabcrashed": {
    235 221 
           RPMSendAsyncMessage: ["Load", "closeTab", "restoreTab", "restoreAll"],
    236 222 
           RPMAddMessageListener: ["*"],

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help