From 75f3f46df3935ea8dea18e7aa5b0569b84b53991 Mon Sep 17 00:00:00 2001
From: Alex Catarineu <acat@torproject.org>
Date: Tue, 10 Sep 2019 16:29:31 +0200
Subject: [PATCH] Bug 26345: Hide tracking protection UI

---
 .../components/controlcenter/content/identityPanel.inc.xul    | 3 ++-
 browser/components/customizableui/content/panelUI.inc.xul     | 4 ++--
 browser/themes/shared/identity-block/identity-block.inc.css   | 4 ++++
 browser/themes/shared/incontentprefs/privacy.css              | 4 ++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/browser/components/controlcenter/content/identityPanel.inc.xul b/browser/components/controlcenter/content/identityPanel.inc.xul
index 73cb3968c7fb7..88d5074589e36 100644
--- a/browser/components/controlcenter/content/identityPanel.inc.xul
+++ b/browser/components/controlcenter/content/identityPanel.inc.xul
@@ -73,7 +73,8 @@
       <!-- Tracking Protection Section -->
       <hbox id="tracking-protection-container"
             class="identity-popup-section"
-            when-connection="not-secure secure secure-ev secure-cert-user-overridden extension">
+            when-connection="not-secure secure secure-ev secure-cert-user-overridden extension"
+            hidden="true">
         <vbox id="identity-popup-content-blocking-content" flex="1">
           <hbox align="start">
             <label id="content-blocking-label"
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index b2c70b9f041dc..2b56e73011535 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -257,7 +257,7 @@
           </hbox>
         </toolbaritem>
         <toolbarseparator class="sync-ui-item"/>
-        <toolbaritem>
+        <toolbaritem hidden="true">
           <toolbarbutton id="appMenu-tp-button"
                class="subviewbutton subviewbutton-iconic"
                oncommand="ContentBlocking.openPreferences('appMenu-trackingprotection');">
@@ -266,7 +266,7 @@
             <label id="appMenu-tp-category"/>
           </toolbarbutton>
         </toolbaritem>
-        <toolbarseparator id="appMenu-tp-separator"/>
+        <toolbarseparator hidden="true" id="appMenu-tp-separator"/>
         <toolbarbutton id="appMenu-new-window-button"
                        class="subviewbutton subviewbutton-iconic"
                        label="&newNavigatorCmd.label;"
diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css
index d8233077be69e..e1911fd473050 100644
--- a/browser/themes/shared/identity-block/identity-block.inc.css
+++ b/browser/themes/shared/identity-block/identity-block.inc.css
@@ -172,6 +172,10 @@ toolbar[brighttext] #urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #
 
 /* TRACKING PROTECTION ICON */
 
+#tracking-protection-icon-box {
+  display: none;
+}
+
 #tracking-protection-icon-box {
   visibility: collapse;
   overflow: hidden;
diff --git a/browser/themes/shared/incontentprefs/privacy.css b/browser/themes/shared/incontentprefs/privacy.css
index 5cb165d7d48d3..ce9614bcd6772 100644
--- a/browser/themes/shared/incontentprefs/privacy.css
+++ b/browser/themes/shared/incontentprefs/privacy.css
@@ -88,6 +88,10 @@
 
 /* Content Blocking */
 
+#trackingGroup {
+  display: none;
+}
+
 /* Override styling that sets descriptions as grey */
 #trackingGroup description.indent,
 #trackingGroup .indent > description {
-- 
GitLab