[tor-commits] [tor-browser/tor-browser-91.5.0esr-11.5-2] Bug 26345: Hide tracking protection UI

[richard@xxxxxxxxxxxxxx]

commit 8dc50cda30ba9b9041b752b3cf4c73071435141d
Author: Alex Catarineu <acat@xxxxxxxxxxxxxx>
Date:   Tue Sep 10 16:29:31 2019 +0200

    Bug 26345: Hide tracking protection UI
---
 browser/base/content/appmenu-viewcache.inc.xhtml | 4 ++--
 browser/base/content/browser-siteIdentity.js     | 4 ++--
 browser/components/about/AboutRedirector.cpp     | 4 ----
 browser/components/about/components.conf         | 1 -
 browser/components/moz.build                     | 1 -
 browser/themes/shared/preferences/privacy.css    | 4 ++++
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
index 204b84f00000..895ef976fc23 100644
--- a/browser/base/content/appmenu-viewcache.inc.xhtml
+++ b/browser/base/content/appmenu-viewcache.inc.xhtml
@@ -24,7 +24,7 @@
                       oncommand="gSync.toggleAccountPanel(this, event)"/>
       </toolbaritem>
       <toolbarseparator class="sync-ui-item"/>
-      <toolbaritem>
+      <toolbaritem hidden="true">
         <toolbarbutton id="appMenu-protection-report-button"
              class="subviewbutton subviewbutton-iconic"
              oncommand="gProtectionsHandler.openProtections(); gProtectionsHandler.recordClick('open_full_report', null, 'app_menu');">
@@ -35,7 +35,7 @@
           </label>
         </toolbarbutton>
       </toolbaritem>
-      <toolbarseparator id="appMenu-tp-separator"/>
+      <toolbarseparator hidden="true" id="appMenu-tp-separator"/>
       <toolbarbutton id="appMenu-new-window-button"
                      class="subviewbutton subviewbutton-iconic"
                      data-l10n-id="appmenuitem-new-window"
diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
index 8c6d1e20ddef..2846a1cb2fcf 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -908,10 +908,10 @@ var gIdentityHandler = {
       gPermissionPanel.refreshPermissionIcons();
     }
 
-    // Hide the shield icon if it is a chrome page.
+    // Bug 26345: Hide tracking protection UI.
     gProtectionsHandler._trackingProtectionIconContainer.classList.toggle(
       "chromeUI",
-      this._isSecureInternalUI
+      true
     );
   },
 
diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp
index 2ace276cd50c..6d283fe67b20 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -122,10 +122,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},
 };
 
 static nsAutoCString GetAboutModuleName(nsIURI* aURI) {
diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf
index 6fd827dead37..8ce22e9cff51 100644
--- 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
index 5f8780e01c65..1bc09f4093fb 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -45,7 +45,6 @@ DIRS += [
     "preferences",
     "privatebrowsing",
     "prompts",
-    "protections",
     "protocolhandler",
     "resistfingerprinting",
     "search",
diff --git a/browser/themes/shared/preferences/privacy.css b/browser/themes/shared/preferences/privacy.css
index b55c242b4c05..154222f84b11 100644
--- a/browser/themes/shared/preferences/privacy.css
+++ b/browser/themes/shared/preferences/privacy.css
@@ -77,6 +77,10 @@
 
 /* Content Blocking */
 
+#trackingGroup {
+  display: none;
+}
+
 /* Override styling that sets descriptions as grey */
 #trackingGroup description.indent,
 #trackingGroup .indent > description {



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits