commit b6f3b990ed723af2dd02efdfdf2526b0e5ef6c61 parent 029e5713474c9d148a72f680059615ea0c65405f Author: Alex Catarineu <acat@torproject.org> Date: Tue, 10 Sep 2019 16:29:31 +0200 BB 26345: Hide tracking protection UI Diffstat:
7 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest @@ -50,7 +50,6 @@ category browser-first-window-ready resource:///modules/PageActions.sys.mjs Page category browser-first-window-ready moz-src:///toolkit/components/doh/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 category browser-first-window-ready moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs IPProtectionService.init #ifdef MOZ_SANDBOX diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs @@ -21,8 +21,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", DAPIncrementality: "resource://gre/modules/DAPIncrementality.sys.mjs", @@ -374,8 +372,6 @@ BrowserGlue.prototype = { this._gmpInstallManager.uninit(); delete this._gmpInstallManager; } - - lazy.ContentBlockingPrefs.uninit(); }, // runs on startup, before the first command line handler is invoked diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp @@ -132,11 +132,6 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::HIDE_FROM_ABOUTABOUT}, {"restartrequired", "chrome://browser/content/aboutRestartRequired.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, - {"protections", "chrome://browser/content/protections.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | - nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | - nsIAboutModule::IS_SECURE_CHROME_UI}, #ifdef MOZ_SELECTABLE_PROFILES {"profilemanager", "chrome://browser/content/profiles/profiles.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI | diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf @@ -19,7 +19,6 @@ pages = [ 'policies', 'preferences', 'privatebrowsing', - 'protections', 'profiling', 'reader', 'restartrequired', diff --git a/browser/components/moz.build b/browser/components/moz.build @@ -55,7 +55,6 @@ DIRS += [ "preferences", "privatebrowsing", "prompts", - "protections", "protocolhandler", "qrcode", "reportbrokensite", diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml @@ -21,7 +21,7 @@ <html:setting-group groupid="etpStatus" data-category="panePrivacy" data-subcategory="etpStatus" hidden="true"></html:setting-group> <!-- Tracking / Content Blocking --> -<groupbox id="trackingGroup" data-category="panePrivacy" data-srd-groupid="etpBanner" hidden="true" aria-describedby="contentBlockingDescription" class="highlighting-group"> +<groupbox id="trackingGroup" data-category="panePrivacy" data-hidden-from-search="true" data-srd-groupid="etpBanner" hidden="true" aria-describedby="contentBlockingDescription" class="highlighting-group"> <label id="contentBlockingHeader"><html:h2 data-l10n-id="content-blocking-enhanced-tracking-protection"/></label> <vbox data-subcategory="trackingprotection"> <hbox align="start"> diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css @@ -258,6 +258,9 @@ /* TRACKING PROTECTION ICON */ #tracking-protection-icon-container { + /* Always hide the tracking toolbar button in Base Browser. + * tor-browser#26345. */ + display: none !important; padding-inline: var(--urlbar-icon-padding); border-radius: var(--urlbar-inner-border-radius); /* This is needed in order to position the blue dot indicator. */