morgan pushed to branch tor-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
    ... ... @@ -621,8 +621,6 @@ var gBrowserInit = {
    621 621
    622 622 
         CaptivePortalWatcher.delayedStartup();
    623 623
    624 
    -    ShoppingSidebarManager.ensureInitialized();
    625 
    -
    626 624 
         SessionStore.promiseAllWindowsRestored.then(() => {
    627 625 
           this._schedulePerWindowIdleTasks();
    628 626 
           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",
    ... ... @@ -72,8 +72,8 @@ ChromeUtils.defineESModuleGetters(this, {
    72 72 
       SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs",
    73 73 
       SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
    74 74 
       SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
    75 
    -  ShoppingSidebarParent: "resource:///actors/ShoppingSidebarParent.sys.mjs",
    76 
    -  ShoppingSidebarManager: "resource:///actors/ShoppingSidebarParent.sys.mjs",
    75 
    +  // Removed ShoppingSidebarParent and ShoppingSidebarManager.
    76 
    +  // tor-browser#42831.
    77 77 
       ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
    78 78 
       SiteDataManager: "resource:///modules/SiteDataManager.sys.mjs",
    79 79 
       SitePermissions: "resource:///modules/SitePermissions.sys.mjs",
    ... ... @@ -4382,10 +4382,6 @@ var TabsProgressListener = {
    4382 4382 
           return;
    4383 4383 
         }
    4384 4384
    4385 
    -    // Some shops use pushState to move between individual products, so
    4386 
    -    // the shopping code needs to be told about all of these.
    4387 
    -    ShoppingSidebarManager.onLocationChange(aBrowser, aLocationURI, aFlags);
    4388 
    -
    4389 4385 
         // Filter out location changes caused by anchor navigation
    4390 4386 
         // or history.push/pop/replaceState.
    4391 4387 
         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
    ... ... @@ -131,7 +131,7 @@
    131 131 
       Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this);
    132 132 
       Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);
    133 133 
       Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
    134 
    -  Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this);
    134 
    +  // Removed shopping-sidebar.js. tor-browser#42831.
    135 135 
       Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this);
    136 136
    137 137 
       window.onload = gBrowserInit.onLoad.bind(gBrowserInit);

  • browser/base/content/navigator-toolbox.inc.xhtml
    ... ... @@ -398,6 +398,8 @@
    398 398 
                     <image class="urlbar-icon" id="translations-button-circle-arrows" />
    399 399 
                     <html:span id="translations-button-locale" aria-hidden="true" />
    400 400 
                   </hbox>
    401 
    +              <!-- #shopping-sidebar-button should remain hidden.
    402 
    +                 - tor-browser#42831. -->
    401 403 
                   <hbox id="shopping-sidebar-button"
    402 404 
                       class="urlbar-page-action"
    403 405 
                       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",
    ... ... @@ -522,19 +522,7 @@ let JSWINDOWACTORS = {
    522 522 
         matches: ["about:tor"],
    523 523 
       },
    524 524
    525 
    -  AboutWelcomeShopping: {
    526 
    -    parent: {
    527 
    -      esModuleURI: "resource:///actors/AboutWelcomeParent.sys.mjs",
    528 
    -    },
    529 
    -    child: {
    530 
    -      esModuleURI: "resource:///actors/AboutWelcomeChild.sys.mjs",
    531 
    -      events: {
    532 
    -        Update: {},
    533 
    -      },
    534 
    -    },
    535 
    -    matches: ["about:shoppingsidebar"],
    536 
    -    remoteTypes: ["privilegedabout"],
    537 
    -  },
    525 
    +  // Removed AboutWelcomeShopping. tor-browser#42831.
    538 526
    539 527 
       AboutWelcome: {
    540 528 
         parent: {
    ... ... @@ -975,27 +963,7 @@ let JSWINDOWACTORS = {
    975 963 
         matches: ["about:studies*"],
    976 964 
       },
    977 965
    978 
    -  ShoppingSidebar: {
    979 
    -    parent: {
    980 
    -      esModuleURI: "resource:///actors/ShoppingSidebarParent.sys.mjs",
    981 
    -    },
    982 
    -    child: {
    983 
    -      esModuleURI: "resource:///actors/ShoppingSidebarChild.sys.mjs",
    984 
    -      events: {
    985 
    -        ContentReady: { wantUntrusted: true },
    986 
    -        PolledRequestMade: { wantUntrusted: true },
    987 
    -        // This is added so the actor instantiates immediately and makes
    988 
    -        // methods available to the page js on load.
    989 
    -        DOMDocElementInserted: {},
    990 
    -        ReportProductAvailable: { wantUntrusted: true },
    991 
    -        AdClicked: { wantUntrusted: true },
    992 
    -        AdImpression: { wantUntrusted: true },
    993 
    -        DisableShopping: { wantUntrusted: true },
    994 
    -      },
    995 
    -    },
    996 
    -    matches: ["about:shoppingsidebar"],
    997 
    -    remoteTypes: ["privilegedabout"],
    998 
    -  },
    966 
    +  // Removed ShoppingSidebar. tor-browser#42831.
    999 967
    1000 968 
       SpeechDispatcher: {
    1001 969 
         parent: {
    ... ... @@ -2386,7 +2354,6 @@ BrowserGlue.prototype = {
    2386 2354 
             }
    2387 2355 
           },
    2388 2356 
           () => lazy.RFPHelper.uninit(),
    2389 
    -      () => lazy.ShoppingUtils.uninit(),
    2390 2357 
           () => {
    2391 2358 
             if (AppConstants.MOZ_UPDATER) {
    2392 2359 
               lazy.UpdateListener.reset();
    ... ... @@ -3369,13 +3336,6 @@ BrowserGlue.prototype = {
    3369 3336 
             },
    3370 3337 
           },
    3371 3338
    3372 
    -      {
    3373 
    -        name: "ShoppingUtils.init",
    3374 
    -        task: () => {
    3375 
    -          lazy.ShoppingUtils.init();
    3376 
    -        },
    3377 
    -      },
    3378 
    -
    3379 3339 
           {
    3380 3340 
             // Starts the JSOracle process for ORB JavaScript validation, if it hasn't started already.
    3381 3341 
             name: "start-orb-javascript-oracle",

  • browser/components/about/AboutRedirector.cpp
    ... ... @@ -102,12 +102,7 @@ static const RedirEntry kRedirMap[] = {
    102 102 
         {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml",
    103 103 
          nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT |
    104 104 
              nsIAboutModule::IS_SECURE_CHROME_UI},
    105 
    -    {"shoppingsidebar", "chrome://browser/content/shopping/shopping.html",
    106 
    -     nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
    107 
    -         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
    108 
    -         nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    109 
    -         nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT |
    110 
    -         nsIAboutModule::IS_SECURE_CHROME_UI},
    105 
    +    // Removed about:shoppingsidebar. tor-browser#42831.
    111 106 
         {"tabcrashed", "chrome://browser/content/aboutTabCrashed.xhtml",
    112 107 
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    113 108 
              nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},

  • browser/components/about/components.conf
    ... ... @@ -28,7 +28,7 @@ pages = [
    28 28 
         'rulesets',
    29 29 
         'sessionrestore',
    30 30 
         'settings',
    31 
    -    'shoppingsidebar',
    31 
    +    # Removed 'shoppingsidebar'. tor-browser#42831.
    32 32 
         'tabcrashed',
    33 33 
         'unloads',
    34 34 
         '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
    ... ... @@ -231,21 +231,7 @@ export let RemotePageAccessManager = {
    231 231 
             "rulesets:update-channel",
    232 232 
           ],
    233 233 
         },
    234 
    -    "about:shoppingsidebar": {
    235 
    -      RPMSetPref: [
    236 
    -        "browser.shopping.experience2023.optedIn",
    237 
    -        "browser.shopping.experience2023.active",
    238 
    -        "browser.shopping.experience2023.ads.userEnabled",
    239 
    -        "browser.shopping.experience2023.sidebarClosedCount",
    240 
    -        "browser.shopping.experience2023.showKeepSidebarClosedMessage",
    241 
    -        "browser.shopping.experience2023.autoOpen.userEnabled",
    242 
    -      ],
    243 
    -      RPMGetFormatURLPref: ["app.support.baseURL"],
    244 
    -      RPMGetIntPref: ["browser.shopping.experience2023.sidebarClosedCount"],
    245 
    -      RPMGetBoolPref: [
    246 
    -        "browser.shopping.experience2023.showKeepSidebarClosedMessage",
    247 
    -      ],
    248 
    -    },
    234 
    +    // Removed about:shoppingsidebar. tor-browser#42831.
    249 235 
         "about:tabcrashed": {
    250 236 
           RPMSendAsyncMessage: ["Load", "closeTab", "restoreTab", "restoreAll"],
    251 237 
           RPMAddMessageListener: ["*"],

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