Bug 468011: Combine all chrome into a single jar file r=bsmedberg

browser/installer/removed-files.in

@@ -1,3 +1,7 @@
+chrome/classic.jar
+chrome/classic.manifest
+chrome/reporter.jar
+chrome/reporter.manifest
 chrome/US.jar
 chrome/en-win.jar
 chrome/help.jar

browser/themes/gnomestripe/browser/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+browser.jar:
 % skin browser classic/1.0 %skin/classic/browser/
 % override chrome://global/skin/icons/warning-16.png moz-icon://stock/gtk-dialog-warning?size=menu
   skin/classic/browser/sanitizeDialog.css             (sanitizeDialog.css)

browser/themes/gnomestripe/communicator/jar.mn

@@ -1,3 +1,3 @@
-classic.jar:
+browser.jar:
 % skin communicator classic/1.0 %skin/classic/communicator/
         skin/classic/communicator/communicator.css

browser/themes/pinstripe/browser/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+browser.jar:
 % skin browser classic/1.0 %skin/classic/browser/
   skin/classic/browser/sanitizeDialog.css                   (sanitizeDialog.css)
 * skin/classic/browser/aboutPrivateBrowsing.css             (aboutPrivateBrowsing.css)

browser/themes/pinstripe/communicator/jar.mn

@@ -1,3 +1,3 @@
-classic.jar:
+browser.jar:
 % skin communicator classic/1.0 %skin/classic/communicator/
         skin/classic/communicator/communicator.css

browser/themes/winstripe/browser/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+browser.jar:
 % skin browser classic/1.0 %skin/classic/browser/ os=WINNT osversion<6
 % skin browser classic/1.0 %skin/classic/browser/ os!=WINNT
 # NOTE: If you add a new file here, you'll need to add it to the aero
@@ -94,7 +94,7 @@ classic.jar:
         preview.png
 
 #ifdef XP_WIN
-classic.jar:
+browser.jar:
 % skin browser classic/1.0 %skin/classic/aero/browser/ os=WINNT osversion>=6
         skin/classic/aero/browser/sanitizeDialog.css                       (sanitizeDialog.css)
 *       skin/classic/aero/browser/aboutPrivateBrowsing.css           (aboutPrivateBrowsing.css)

browser/themes/winstripe/communicator/jar.mn

@@ -1,3 +1,3 @@
-classic.jar:
+browser.jar:
 % skin communicator classic/1.0 %skin/classic/communicator/
         skin/classic/communicator/communicator.css

extensions/reporter/jar.mn

@@ -1,4 +1,4 @@
-reporter.jar:
+browser.jar:
 % content reporter %content/reporter/ xpcnativewrappers=yes
 % overlay chrome://browser/content/browser.xul         chrome://reporter/content/reporterOverlay.xul
 % overlay chrome://navigator/content/navigator.xul     chrome://reporter/content/reporterOverlay.xul

toolkit/profile/skin/jar.mn

@@ -1,3 +1,3 @@
-classic.jar:
+toolkit.jar:
   skin/classic/mozapps/profile/profileSelection.css
   skin/classic/mozapps/profile/profileicon.png

toolkit/themes/faststripe/global/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin global classic/1.0 %skin/classic/global/
 # These are the CSS files that have been changed from winstripe
 +  skin/classic/global/button.css

toolkit/themes/gnomestripe/global/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 +  skin/classic/global/autocomplete.css
 +  skin/classic/global/popup.css
 +  skin/classic/global/menu.css

toolkit/themes/gnomestripe/help/jar.mn

@@ -1,2 +1,2 @@
-classic.jar:
+toolkit.jar:
 +  skin/classic/help/help.css

toolkit/themes/gnomestripe/mozapps/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 + skin/classic/mozapps/update/update.png                   (update/update.png)
 + skin/classic/mozapps/update/updates.css                  (update/updates.css)
 + skin/classic/mozapps/downloads/downloadIcon.png          (downloads/downloadIcon.png)

toolkit/themes/pinstripe/global/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin global classic/1.0 %skin/classic/global/
 +  skin/classic/global/10pct_transparent_grey.png
 +  skin/classic/global/20pct_transparent_pixel.png

toolkit/themes/pinstripe/help/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin help classic/1.0 %skin/classic/help/
   skin/classic/help/help.css
   skin/classic/help/Toolbar.png

toolkit/themes/pinstripe/mozapps/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin mozapps classic/1.0 %skin/classic/mozapps/
   skin/classic/mozapps/downloads/buttons.png                      (downloads/buttons.png)
   skin/classic/mozapps/downloads/downloadIcon.png                 (downloads/downloadIcon.png)

toolkit/themes/pmstripe/global/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 +  skin/classic/global/popup.css
 +  skin/classic/global/menu.css
 +  skin/classic/global/toolbar.css

toolkit/themes/winstripe/global/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin global classic/1.0 %skin/classic/global/ os=WINNT osversion<6
 % skin global classic/1.0 %skin/classic/global/ os!=WINNT
 # NOTE: If you add a new file here, you'll need to add it to the aero
@@ -163,7 +163,7 @@ classic.jar:
         skin/classic/global/tree/twisty-open.png                 (tree/twisty-open.png)
 
 #ifdef XP_WIN
-classic.jar:
+toolkit.jar:
 % skin global classic/1.0 %skin/classic/aero/global/ os=WINNT osversion>=6
         skin/classic/aero/global/about.css
         skin/classic/aero/global/appPicker.css

toolkit/themes/winstripe/help/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin help classic/1.0 %skin/classic/help/
   skin/classic/help/help.css
   skin/classic/help/Toolbar.png

toolkit/themes/winstripe/mozapps/jar.mn

@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin mozapps classic/1.0 %skin/classic/mozapps/ os=WINNT osversion<6
 % skin mozapps classic/1.0 %skin/classic/mozapps/ os!=WINNT
 # NOTE: If you add a new file here, you'll need to add it to the aero
@@ -42,7 +42,7 @@ classic.jar:
         skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png    (xpinstall/xpinstallItemGeneric.png)
 
 #ifdef XP_WIN
-classic.jar:
+toolkit.jar:
 % skin mozapps classic/1.0 %skin/classic/aero/mozapps/ os=WINNT osversion>=6
         skin/classic/aero/mozapps/downloads/downloadButtons.png            (downloads/downloadButtons-aero.png)
         skin/classic/aero/mozapps/downloads/downloadIcon.png               (downloads/downloadIcon-aero.png)