Bug 1397729 - Strings inside cookies dialog are not found when searched. r=mconley, a=lizzard
☠☠ backed out by 15c749b4b264 ☠ ☠
authorRicky Chien <ricky060709@gmail.com>
Wed, 13 Sep 2017 18:22:42 -0400
changeset 421718 6bc1744c12eed8c652ca811053e8ce859c2c4a1c
parent 421717 577b2db694a7812dd737c4e18283119c53277630
child 421719 58e1249a4920875a7935730b61b788dc3d7288ff
push id7755
push userryanvm@gmail.com
push dateWed, 13 Sep 2017 22:45:29 +0000
treeherdermozilla-beta@fafd69ca2733 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley, lizzard
bugs1397729
milestone56.0
Bug 1397729 - Strings inside cookies dialog are not found when searched. r=mconley, a=lizzard MozReview-Commit-ID: 6LOE6aBZX0J
browser/components/preferences/in-content-new/privacy.js
browser/components/preferences/in-content/privacy.xul
--- a/browser/components/preferences/in-content-new/privacy.js
+++ b/browser/components/preferences/in-content-new/privacy.js
@@ -250,16 +250,25 @@ var gPrivacyPane = {
     let pkiBundle = document.getElementById("pkiBundle");
     appendSearchKeywords("passwordExceptions", [
       bundlePrefs.getString("savedLoginsExceptions_title"),
       bundlePrefs.getString("savedLoginsExceptions_desc2"),
     ]);
     appendSearchKeywords("showPasswords", [
       signonBundle.getString("loginsDescriptionAll"),
     ]);
+    appendSearchKeywords("cookieExceptions", [
+      bundlePrefs.getString("cookiepermissionstext")
+    ]);
+    appendSearchKeywords("showCookiesButton", [
+      bundlePrefs.getString("cookiesAll"),
+      bundlePrefs.getString("removeAllCookies.label"),
+      bundlePrefs.getString("removeAllShownCookies.label"),
+      bundlePrefs.getString("removeSelectedCookies.label"),
+    ]);
     appendSearchKeywords("trackingProtectionExceptions", [
       bundlePrefs.getString("trackingprotectionpermissionstitle"),
       bundlePrefs.getString("trackingprotectionpermissionstext2"),
     ]);
     appendSearchKeywords("changeBlockList", [
       bundlePrefs.getString("blockliststitle"),
       bundlePrefs.getString("blockliststext"),
     ]);
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -207,34 +207,48 @@
           </vbox>
           <hbox id="cookiesBox">
             <checkbox id="acceptCookies" label="&acceptCookies2.label;"
                       preference="network.cookie.cookieBehavior"
                       accesskey="&acceptCookies2.accesskey;"
                       onsyncfrompreference="return gPrivacyPane.readAcceptCookies();"
                       onsynctopreference="return gPrivacyPane.writeAcceptCookies();"/>
             <spacer flex="1" />
-            <button id="cookieExceptions"
-                    label="&cookieExceptions.label;" accesskey="&cookieExceptions.accesskey;"
-                    preference="pref.privacy.disable_button.cookie_exceptions"/>
+            <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
+            <hbox>
+              <button id="cookieExceptions"
+                      label="&cookieExceptions.label;" accesskey="&cookieExceptions.accesskey;"
+                      preference="pref.privacy.disable_button.cookie_exceptions"
+                      searchkeywords="&address2.label;
+                                      &block.label;
+                                      &session.label;
+                                      &allow.label;
+                                      &removepermission2.label;
+                                      &removeallpermissions2.label;
+                                      &button.cancel.label;
+                                      &button.ok.label;"/>
+            </hbox>
           </hbox>
           <hbox id="acceptThirdPartyRow"
                 class="indent"
                 align="center">
             <label id="acceptThirdPartyLabel" control="acceptThirdPartyMenu"
                    accesskey="&acceptThirdParty.pre.accesskey;">&acceptThirdParty.pre.label;</label>
-            <menulist id="acceptThirdPartyMenu" preference="network.cookie.cookieBehavior"
-            onsyncfrompreference="return gPrivacyPane.readAcceptThirdPartyCookies();"
-            onsynctopreference="return gPrivacyPane.writeAcceptThirdPartyCookies();">
-              <menupopup>
-                <menuitem label="&acceptThirdParty.always.label;" value="always"/>
-                <menuitem label="&acceptThirdParty.visited.label;" value="visited"/>
-                <menuitem label="&acceptThirdParty.never.label;" value="never"/>
-              </menupopup>
-            </menulist>
+            <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
+            <hbox>
+              <menulist id="acceptThirdPartyMenu" preference="network.cookie.cookieBehavior"
+              onsyncfrompreference="return gPrivacyPane.readAcceptThirdPartyCookies();"
+              onsynctopreference="return gPrivacyPane.writeAcceptThirdPartyCookies();">
+                <menupopup>
+                  <menuitem label="&acceptThirdParty.always.label;" value="always"/>
+                  <menuitem label="&acceptThirdParty.visited.label;" value="visited"/>
+                  <menuitem label="&acceptThirdParty.never.label;" value="never"/>
+                </menupopup>
+              </menulist>
+            </hbox>
           </hbox>
           <hbox id="keepRow"
                 class="indent"
                 align="center">
             <label id="keepUntil"
                    control="keepCookiesUntil"
                    accesskey="&keepUntil.accesskey;">&keepUntil.label;</label>
             <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
@@ -243,29 +257,47 @@
                         preference="network.cookie.lifetimePolicy">
                 <menupopup>
                   <menuitem label="&expire.label;" value="0"/>
                   <menuitem label="&close.label;" value="2"/>
                 </menupopup>
               </menulist>
             </hbox>
             <spacer flex="1"/>
-            <button id="showCookiesButton"
-                    label="&showCookies.label;" accesskey="&showCookies.accesskey;"
-                    preference="pref.privacy.disable_button.view_cookies"/>
+            <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
+            <hbox>
+              <button id="showCookiesButton"
+                      label="&showCookies.label;"
+                      accesskey="&showCookies.accesskey;"
+                      preference="pref.privacy.disable_button.view_cookies"/>
+            </hbox>
           </hbox>
           <hbox id="clearDataBox"
                 align="center">
             <checkbox id="alwaysClear"
                       preference="privacy.sanitize.sanitizeOnShutdown"
                       label="&clearOnClose.label;"
                       accesskey="&clearOnClose.accesskey;"/>
             <spacer flex="1"/>
-            <button id="clearDataSettings" label="&clearOnCloseSettings.label;"
-                    accesskey="&clearOnCloseSettings.accesskey;"/>
+            <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
+            <hbox>
+              <button id="clearDataSettings"
+                      label="&clearOnCloseSettings.label;"
+                      accesskey="&clearOnCloseSettings.accesskey;"
+                      searchkeywords="&clearDataSettings2.label;
+                                      &historySection.label;
+                                      &itemHistoryAndDownloads.label;
+                                      &itemCookies.label;
+                                      &itemActiveLogins.label;
+                                      &itemCache.label;
+                                      &itemFormSearchHistory.label;
+                                      &dataSection.label;
+                                      &itemSitePreferences.label;
+                                      &itemOfflineApps.label;"/>
+            </hbox>
           </hbox>
         </vbox>
       </vbox>
     </vbox>
   </deck>
 </groupbox>
 
 <!-- Location Bar -->