From 5f138b99423ecc2ffe85b45654caeb74fae38a4c Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Wed, 23 Nov 2016 13:42:00 -0800
Subject: [PATCH] Bug 1318537 - Remove Learn More link from the insecure login
 field autocomplete popup. r=seanlee

MozReview-Commit-ID: KbRokkIr8DE

--HG--
extra : rebase_source : d25cb7d611870ef30d0fdc074b5ba3db236776e9
---
 toolkit/content/widgets/autocomplete.xml        | 17 -----------------
 .../chrome/passwordmgr/passwordmgr.properties   |  1 -
 2 files changed, 18 deletions(-)

diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index f1a0e8c00d12..119cf771a0d7 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -1474,7 +1474,6 @@ extends="chrome://global/content/bindings/popup.xml#popup">
                            class="ac-title-text"
                            xbl:inherits="selected"/>
         </xul:description>
-        <xul:label id="learnMoreLink" align="left" class="text-link"/>
       </xul:vbox>
       <xul:hbox anonid="tags"
                 class="ac-tags"
@@ -1511,22 +1510,6 @@ extends="chrome://global/content/bindings/popup.xml#popup">
         </xul:description>
       </xul:hbox>
     </content>
-    <implementation>
-      <constructor><![CDATA[
-        let learnMoreLink = document.getElementById("learnMoreLink");
-        learnMoreLink.setAttribute("value", this._stringBundle.GetStringFromName("insecureFieldWarningLearnMore"));
-        learnMoreLink.setAttribute("href", Services.urlFormatter.formatURLPref("app.support.baseURL") + "insecure-form-field-warning");
-      ]]></constructor>
-
-      <property name="_stringBundle">
-        <getter><![CDATA[
-          if (!this.__stringBundle) {
-            this.__stringBundle = Services.strings.createBundle("chrome://passwordmgr/locale/passwordmgr.properties");
-          }
-          return this.__stringBundle;
-        ]]></getter>
-      </property>
-    </implementation>
   </binding>
 
   <binding id="autocomplete-richlistitem" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
diff --git a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
index de491b72ccd2..c66b0d19bef1 100644
--- a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
@@ -72,4 +72,3 @@ duplicateLoginTitle=Login already exists
 duplicateLogin=A duplicate login already exists.
 
 insecureFieldWarningDescription = This connection is not secure. Logins entered here could be compromised.
-insecureFieldWarningLearnMore = Learn More