From dbd1a56877f062199bd7030759c4f3bc380c53e9 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Tue, 19 Jul 2016 16:30:06 +0200
Subject: [PATCH] Bug 1279029 - part 2 - removed 'learn more' for Containers,
 r=gijs

---
 browser/components/preferences/in-content/privacy.js         | 4 ----
 browser/components/preferences/in-content/privacy.xul        | 5 +----
 browser/locales/en-US/chrome/browser/preferences/privacy.dtd | 1 -
 browser/themes/shared/incontentprefs/preferences.inc.css     | 3 +--
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js
index daea3ce1ce4d..5629ec9edd12 100644
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -61,10 +61,6 @@ var gPrivacyPane = {
       return;
     }
 
-    let link = document.getElementById("browserContainersLearnMore");
-    // TODO: this link doesn't exist yet!
-    link.href = Services.urlFormatter.formatURLPref("app.support.baseURL") + "containers";
-
     document.getElementById("browserContainersbox").hidden = false;
   },
 
diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul
index 7db4f33fc32d..6d2b53d97193 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -292,10 +292,7 @@
 <!-- Containers -->
 <groupbox id="browserContainersGroup" data-category="panePrivacy" hidden="true">
   <vbox id="browserContainersbox" hidden="true">
-    <caption><label>&browserContainersHeader.label;
-      <label id="browserContainersLearnMore" class="text-link"
-             value="&browserContainersLearnMore.label;"/>
-    </label></caption>
+    <caption><label>&browserContainersHeader.label;</label></caption>
     <checkbox id="browserContainersCheckbox"
               label="&browserContainersEnabled.label;"
               accesskey="&browserContainersEnabled.accesskey;"
diff --git a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
index 6e08ae467b6a..85c76532c9a0 100644
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -106,6 +106,5 @@
 <!ENTITY  clearOnCloseSettings.accesskey "t">
 
 <!ENTITY  browserContainersHeader.label         "Container Tabs">
-<!ENTITY  browserContainersLearnMore.label      "Learn more">
 <!ENTITY  browserContainersEnabled.label        "Enable Container Tabs">
 <!ENTITY  browserContainersEnabled.accesskey    "a">
diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css
index f34dc8d37e06..20f3f7089324 100644
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -223,8 +223,7 @@ treecol {
 /* Privacy pane */
 
 #trackingProtectionPBMLearnMore,
-#trackingProtectionLearnMore,
-#browserContainersLearnMore {
+#trackingProtectionLearnMore {
   margin-inline-start: 1.5em !important;
   margin-top: 0;
   font-weight: normal;