Bug 351363 - overlays to customizeToolbar.xul should also apply to the sheet implementaion. r=mconnor.

browser/base/content/browser.xul

@@ -510,7 +510,7 @@
       <vbox flex="1">
         <iframe id="customizeToolbarSheetIFrame"
                 style="&dialog.style;"
-                src="chrome://browser/content/customizeToolbarSheet.xul"/>
+                src="chrome://global/content/customizeToolbar.xul"/>
         <vbox flex="1"/>
       </vbox>
       <hbox flex="1"/>

browser/base/jar.mn

@@ -44,7 +44,6 @@ browser.jar:
 *       content/browser/softwareUpdateOverlay.xul  (content/softwareUpdateOverlay.xul)
 #endif
 #ifdef TOOLBAR_CUSTOMIZATION_SHEET
-*       content/browser/customizeToolbarSheet.xul         (content/customizeToolbarSheet.xul)
 *       content/browser/customizeToolbarSheet.js          (content/customizeToolbarSheet.js)
 #endif
 *       content/browser/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)
@@ -60,3 +59,6 @@ browser.jar:
   content/branding/uninstall.properties          (branding/uninstall.properties)
 #endif
 #endif
+
+toolkit.jar:
+*+      content/global/customizeToolbar.xul           (content/customizeToolbarSheet.xul)

extensions/reporter/jar.mn

@@ -4,7 +4,6 @@ reporter.jar:
 #ifdef MOZ_PHOENIX
 % overlay chrome://browser/content/browser.xul         chrome://reporter/content/reporterOverlay.xul
 % overlay chrome://global/content/customizeToolbar.xul chrome://reporter/content/reporterOverlay.xul
-% overlay chrome://browser/content/customizeToolbarSheet.xul chrome://reporter/content/reporterOverlay.xul
 % skin reporter classic/1.0 %skin/classic/reporter/
 #endif
 #else