From f0edc88c2a3f85efd1727e79729c5c04119e180e Mon Sep 17 00:00:00 2001
From: Evan Tseng <evan@tseng.io>
Date: Thu, 4 May 2017 21:31:05 +0800
Subject: [PATCH] Bug 1360140 - Add Learn More link for the Use recommended
 performance settings checkbox r=mconley

MozReview-Commit-ID: 3IQAbU3ovhg

--HG--
extra : rebase_source : 0ea3c904448bd61390f352aeea3efdb4eafbc26c
---
 browser/components/preferences/in-content/main.js     |  4 ++++
 browser/components/preferences/in-content/main.xul    | 11 +++++++----
 .../en-US/chrome/browser/preferences/advanced.dtd     |  2 ++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
index 58cc2f92506b..2da191472217 100644
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -72,6 +72,10 @@ var gMainPane = {
                                       .BrowserSearch.searchEnginesURL;
     addEnginesLink.setAttribute("href", searchEnginesURL);
 
+    let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore");
+    let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance";
+    performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
+
     window.addEventListener("click", this);
     window.addEventListener("command", this);
     window.addEventListener("dragstart", this);
diff --git a/browser/components/preferences/in-content/main.xul b/browser/components/preferences/in-content/main.xul
index f814342343ec..7e95812096ba 100644
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -565,10 +565,13 @@
 <groupbox id="performanceGroup" data-category="paneGeneral" hidden="true">
   <caption><label>&performance.label;</label></caption>
 
-  <checkbox id="useRecommendedPerformanceSettings"
-            label="&useRecommendedPerformanceSettings.label;"
-            accesskey="&useRecommendedPerformanceSettings.accesskey;"
-            preference="browser.preferences.defaultPerformanceSettings.enabled"/>
+  <hbox align="center">
+    <checkbox id="useRecommendedPerformanceSettings"
+              label="&useRecommendedPerformanceSettings.label;"
+              accesskey="&useRecommendedPerformanceSettings.accesskey;"
+              preference="browser.preferences.defaultPerformanceSettings.enabled"/>
+    <label id="performanceSettingsLearnMore" class="learnMore text-link">&performanceSettingsLearnMore.label;</label>
+  </hbox>
   <description class="indent">&useRecommendedPerformanceSettings.description;</description>
 
   <vbox id="performanceSettings" class="indent" hidden="true">
diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
index bbed46eed9ea..c45b9994aae8 100644
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -144,6 +144,8 @@
                                          "Recommended performance settings are tailored to your computer.">
 <!ENTITY useRecommendedPerformanceSettings.accesskey
                                          "U">
+<!ENTITY performanceSettingsLearnMore.label
+                                         "Learn more">
 <!ENTITY limitContentProcess.label       "Content process limit">
 <!ENTITY limitContentProcess.description
                                          "More content processes can make &brandShortName; more responsive when using multiple tabs, but will also consume more memory.">