GitLab

henry pushed to branch base-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

ccac8809

by henry at 2025-07-16T17:00:21+00:00

fixup! BB 26345: Hide tracking protection UI

TB 43947: Prevent import of ContentBlockingPrefs.


(cherry picked from commit ac068db488af00eb389ffe811bb60f450f796157)

Co-authored-by: Henry Wilkes <henry@torproject.org>

2 changed files:

browser/components/BrowserComponents.manifest
browser/components/BrowserGlue.sys.mjs

Changes:

browser/components/BrowserComponents.manifest

@@ -44,7 +44,6 @@ category browser-first-window-ready resource:///modules/PageActions.sys.mjs Page
  category browser-first-window-ready resource://gre/modules/DoHController.sys.mjs DoHController.init
  category browser-first-window-ready moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs ProfilesDatastoreService.init
  category browser-first-window-ready resource:///modules/profiles/SelectableProfileService.sys.mjs SelectableProfileService.init
 -category browser-first-window-ready moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs ContentBlockingPrefs.init
  category browser-first-window-ready resource://gre/modules/CaptchaDetectionPingUtils.sys.mjs CaptchaDetectionPingUtils.init
  #ifdef MOZ_SANDBOX
  #ifdef XP_LINUX

browser/components/BrowserGlue.sys.mjs

@@ -19,8 +19,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
    BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
    BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs",
    BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
 -  ContentBlockingPrefs:
 -    "moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs",
    ContextualIdentityService:
      "resource://gre/modules/ContextualIdentityService.sys.mjs",
    DAPTelemetrySender: "resource://gre/modules/DAPTelemetrySender.sys.mjs",
@@ -575,8 +573,6 @@ BrowserGlue.prototype = {
        this._gmpInstallManager.uninit();
        delete this._gmpInstallManager;
+     }
+-
 -    lazy.ContentBlockingPrefs.uninit();
    },
    // runs on startup, before the first command line handler is invoked