Bug 427973 - Remove cookies button shifts. r=gavin

browser/components/preferences/cookies.js

@@ -582,11 +582,13 @@ var gCookiesWindow = {
     if (item && seln.count == 1 && item.container && item.open)
       selectedCookieCount += 2;
 
-    var stringKey = selectedCookieCount == 1 ? "removeCookie" : "removeCookies";
+    var removeCookie = document.getElementById("removeCookie");
-    document.getElementById("removeCookie").label = this._bundle.getString(stringKey);
+    var removeCookies = document.getElementById("removeCookies");
+    removeCookie.parentNode.selectedPanel =
+      selectedCookieCount == 1 ? removeCookie : removeCookies;
 
     document.getElementById("removeAllCookies").disabled = this._view._filtered;
-    document.getElementById("removeCookie").disabled = !(seln.count > 0);
+    removeCookie.disabled = removeCookies.disabled = !(seln.count > 0);
   },
 
   deleteCookie: function () {

browser/components/preferences/cookies.xul

@@ -124,9 +124,14 @@
   </vbox>
   <hbox align="end">
     <hbox class="actionButtons" flex="1">
-      <button id="removeCookie" disabled="true" icon="remove" 
+      <deck oncommand="gCookiesWindow.deleteCookie();">
-              label="&button.removecookie.label;" accesskey="&button.removecookie.accesskey;"
+        <button id="removeCookie" disabled="true" icon="remove"
-              oncommand="gCookiesWindow.deleteCookie();"/>
+                label="&button.removecookie.label;"
+                accesskey="&button.removecookie.accesskey;"/>
+        <button id="removeCookies" disabled="true" icon="remove"
+                label="&button.removecookies.label;"
+                accesskey="&button.removecookie.accesskey;"/>
+      </deck>
       <button id="removeAllCookies" disabled="true" icon="clear"
               label="&button.removeallcookies.label;" accesskey="&button.removeallcookies.accesskey;"
               oncommand="gCookiesWindow.deleteAllCookies();"/>

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

@@ -3,6 +3,7 @@
 <!ENTITY     cookiesonsystem.label          "The following cookies are stored on your computer:">
 <!ENTITY     cookiename.label               "Cookie Name">
 <!ENTITY     cookiedomain.label             "Site"> 
+<!ENTITY     button.removecookies.label     "Remove Cookies">
 <!ENTITY     button.removecookie.label      "Remove Cookie">
 <!ENTITY     button.removecookie.accesskey  "R">
 <!ENTITY     button.removeallcookies.label  "Remove All Cookies">

browser/locales/en-US/chrome/browser/preferences/preferences.properties

@@ -88,8 +88,6 @@ cannot=Block
 noCookieSelected=<no cookie selected>
 cookiesAll=The following cookies are stored on your computer:
 cookiesFiltered=The following cookies match your search:
-removeCookies=Remove Cookies
-removeCookie=Remove Cookie
 
 #### Offline apps
 offlineAppRemoveTitle=Remove offline website data