Bug 439134 - "Customize toolbars" window a bit too small on linux - cuts off the "Restore defaults" button

r=gavin.sharp

browser/base/content/browser.js

@@ -3339,12 +3339,8 @@ function BrowserCustomizeToolbar()
     else
       sheetFrame.setAttribute("src", customizeURL);
 
-    // XXXmano: there's apparently no better way to get this when the iframe is
-    // hidden
-    var sheetWidth = sheetFrame.style.width.match(/([0-9]+)px/)[1];
     document.getElementById("customizeToolbarSheetPopup")
-            .openPopup(gNavToolbox, "after_start",
-                       (window.innerWidth - sheetWidth) / 2, 0);
+            .openPopup(gNavToolbox, "after_start", 0, 0);
 
     return sheetFrame.contentWindow;
   } else {

browser/base/content/browser.xul

@@ -300,7 +300,9 @@
     <!-- Bookmarks and history tooltip -->
     <tooltip id="bhTooltip"/>
 
-    <panel id="customizeToolbarSheetPopup" noautohide="true">
+    <panel id="customizeToolbarSheetPopup"
+           noautohide="true"
+           onpopupshown="this.moveTo(this.boxObject.screenX + (window.innerWidth - this.boxObject.width) / 2, this.boxObject.screenY);">
       <iframe id="customizeToolbarSheetIFrame"
               style="&dialog.style;"
               hidden="true"/>

toolkit/locales/en-US/chrome/global/customizeToolbar.dtd

@@ -1,5 +1,5 @@
 <!ENTITY dialog.title             "Customize Toolbar">
-<!ENTITY dialog.style             "width: 635px; height: 400px;">
+<!ENTITY dialog.style             "width: 86ch; height: 36em;">
 <!ENTITY instructions.description "You can add or remove items by dragging to or from the toolbars.">
 <!ENTITY show.label               "Show:">
 <!ENTITY iconsAndText.label       "Icons and Text">