Bug 1436568 - Make "clear your recent history" a button instead of a link. r=nhnt11

MozReview-Commit-ID: 1KDXu9OtmHm

--HG--
extra : rebase_source : 7046240e28ac035f839d80d88e50d7522d2cef5b

browser/components/preferences/in-content/privacy.js

@@ -268,17 +268,11 @@ var gPrivacyPane = {
       gPrivacyPane.updatePrivacyMicroControls();
       gPrivacyPane.updateAutostart();
     });
-    setEventListener("historyRememberClear", "click", function(event) {
+    setEventListener("clearHistoryButton", "command", function() {
-      if (event.button == 0) {
+      let historyMode = document.getElementById("historyMode");
-        gPrivacyPane.clearPrivateDataNow(false);
+      // Select "everything" in the clear history dialog if the
-      }
+      // user has set their history mode to never remember history.
-      return false;
+      gPrivacyPane.clearPrivateDataNow(historyMode.value == "dontremember");
-    });
-    setEventListener("historyDontRememberClear", "click", function(event) {
-      if (event.button == 0) {
-        gPrivacyPane.clearPrivateDataNow(true);
-      }
-      return false;
     });
     setEventListener("openSearchEnginePreferences", "click", function(event) {
       if (event.button == 0) {

browser/components/preferences/in-content/privacy.xul

@@ -75,14 +75,8 @@
     <hbox>
       <menulist id="historyMode">
         <menupopup>
-          <menuitem label="&historyHeader.remember.label;" value="remember" searchkeywords="&rememberDescription.label;
+          <menuitem label="&historyHeader.remember.label;" value="remember" searchkeywords="&rememberDescription.label;"/>
-                                                                                            &dontrememberActions.pre.label;
+          <menuitem label="&historyHeader.dontremember.label;" value="dontremember" searchkeywords="&dontrememberDescription.label;"/>
-                                                                                            &dontrememberActions.clearHistory.label;
-                                                                                            &dontrememberActions.post.label;"/>
-          <menuitem label="&historyHeader.dontremember.label;" value="dontremember" searchkeywords="&dontrememberDescription.label;
-                                                                                                    &dontrememberActions.pre.label;
-                                                                                                    &dontrememberActions.clearHistory.label;
-                                                                                                    &dontrememberActions.post.label;"/>
           <menuitem label="&historyHeader.custom.label;" value="custom" searchkeywords="&privateBrowsingPermanent2.label;
                                                                                         &rememberHistory2.label;
                                                                                         &rememberSearchForm.label;
@@ -102,14 +96,12 @@
     </hbox>
     <label>&historyHeader.post.label;</label>
   </hbox>
-  <deck id="historyPane">
+  <hbox>
+    <deck id="historyPane" flex="1">
       <vbox id="historyRememberPane">
         <hbox align="center" flex="1">
           <vbox flex="1">
             <description>&rememberDescription.label;</description>
-          <description>&dontrememberActions.pre.label;<label
-          class="text-link" id="historyRememberClear"
-          >&dontrememberActions.clearHistory.label;</label>&dontrememberActions.post.label;</description>
           </vbox>
         </hbox>
       </vbox>
@@ -117,9 +109,6 @@
         <hbox align="center" flex="1">
           <vbox flex="1">
             <description>&dontrememberDescription.label;</description>
-          <description>&dontrememberActions.pre.label;<label
-          class="text-link" id="historyDontRememberClear"
-          >&dontrememberActions.clearHistory.label;</label>&dontrememberActions.post.label;</description>
           </vbox>
         </hbox>
       </vbox>
@@ -167,6 +156,14 @@
         </vbox>
       </vbox>
     </deck>
+    <vbox align="end">
+      <button id="clearHistoryButton"
+              class="accessory-button"
+              icon="clear"
+              label="&clearHistoryButton.label;"
+              accesskey="&clearHistoryButton.accesskey;"/>
+    </vbox>
+  </hbox>
 </groupbox>
 
 <!-- Site Data -->

browser/locales/en-US/chrome/browser/preferences/privacy.dtd

@@ -70,11 +70,8 @@
 
 <!ENTITY  dontrememberDescription.label  "&brandShortName; will use the same settings as private browsing, and will not remember any history as you browse the Web.">
 
-<!-- LOCALIZATION NOTE (dontrememberActions.pre.label): include a trailing space as needed -->
+<!ENTITY  clearHistoryButton.label       "Clear History…">
-<!-- LOCALIZATION NOTE (dontrememberActions.post.label): include a starting space as needed -->
+<!ENTITY  clearHistoryButton.accesskey   "s">
-<!ENTITY  dontrememberActions.pre.label          "You may also want to ">
-<!ENTITY  dontrememberActions.clearHistory.label "clear all current history">
-<!ENTITY  dontrememberActions.post.label         ".">
 
 <!ENTITY  privateBrowsingPermanent2.label "Always use private browsing mode">
 <!ENTITY  privateBrowsingPermanent2.accesskey "p">

browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm

@@ -125,7 +125,7 @@ async function connectionDialog(aBrowser) {
 
 async function clearRecentHistoryDialog(aBrowser) {
   await ContentTask.spawn(aBrowser, null, async function() {
-    content.document.getElementById("historyRememberClear").click();
+    content.document.getElementById("clearHistoryButton").click();
   });
 }