Bug 26345: Hide tracking protection UI

browser/components/about/AboutRedirector.cpp

@@ -147,11 +147,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},
     {"profilemanager", "chrome://browser/content/profiles/profiles.html",
      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |

browser/components/about/components.conf

@@ -22,7 +22,6 @@ pages = [
     'policies',
     'preferences',
     'privatebrowsing',
-    'protections',
     'profilemanager',
     'profiling',
     'reader',

browser/components/moz.build

@@ -51,7 +51,6 @@ DIRS += [
     "preferences",
     "privatebrowsing",
     "prompts",
-    "protections",
     "protocolhandler",
     "reportbrokensite",
     "resistfingerprinting",

browser/components/preferences/privacy.inc.xhtml

@@ -15,7 +15,7 @@
 </hbox>
 
 <!-- Tracking / Content Blocking -->
-<groupbox id="trackingGroup" data-category="panePrivacy" hidden="true" aria-describedby="contentBlockingDescription" class="highlighting-group">
+<groupbox id="trackingGroup" data-category="panePrivacy" data-hidden-from-search="true" 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">

browser/themes/shared/identity-block/identity-block.css

@@ -230,6 +230,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-icon-border-radius);
   /* This is needed in order to position the blue dot indicator. */