Backed out changeset 607fd3ab6953 (bug 1415014) due to mistake merge

MozReview-Commit-ID: 4vyXS8Mv883

--HG--
rename : browser/branding/aurora/default64.png => browser/branding/aurora/content/icon64.png
rename : browser/branding/aurora/default128.png => browser/branding/aurora/mozicon128.png
rename : browser/branding/nightly/default64.png => browser/branding/nightly/content/icon64.png
rename : browser/branding/nightly/default128.png => browser/branding/nightly/mozicon128.png
rename : browser/branding/official/default64.png => browser/branding/official/content/icon64.png
rename : browser/branding/official/default128.png => browser/branding/official/mozicon128.png
rename : browser/branding/unofficial/default64.png => browser/branding/unofficial/content/icon64.png
rename : browser/branding/unofficial/default128.png => browser/branding/unofficial/mozicon128.png

browser/branding/aurora/content/jar.mn

@@ -8,10 +8,10 @@ browser.jar:
   content/branding/about-logo.png
   content/branding/about-logo@2x.png
   content/branding/about-wordmark.svg
+  content/branding/icon48.png
+  content/branding/icon64.png
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
-  content/branding/icon48.png
-  content/branding/icon64.png                    (../default64.png)
-  content/branding/icon128.png                   (../default128.png)
+  content/branding/icon128.png                   (../mozicon128.png)
   content/branding/identity-icons-brand.svg
   content/branding/aboutDialog.css

browser/branding/branding-common.mozbuild

@@ -45,11 +45,11 @@ def FirefoxBranding():
             'default16.png',
             'default32.png',
             'default48.png',
+            'mozicon128.png',
         ]
+        FINAL_TARGET_FILES.icons += ['mozicon128.png']
         FINAL_TARGET_FILES.chrome.icons.default += [
-            'default128.png',
             'default16.png',
             'default32.png',
             'default48.png',
-            'default64.png',
         ]

browser/branding/nightly/content/jar.mn

@@ -8,10 +8,10 @@ browser.jar:
   content/branding/about-logo.png
   content/branding/about-logo@2x.png
   content/branding/about-wordmark.svg
+  content/branding/icon48.png
+  content/branding/icon64.png
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
-  content/branding/icon48.png
-  content/branding/icon64.png                    (../default64.png)
-  content/branding/icon128.png                   (../default128.png)
+  content/branding/icon128.png                   (../mozicon128.png)
   content/branding/identity-icons-brand.svg
   content/branding/aboutDialog.css

browser/branding/official/content/jar.mn

@@ -8,10 +8,10 @@ browser.jar:
   content/branding/about-logo.png
   content/branding/about-logo@2x.png
   content/branding/about-wordmark.svg
+  content/branding/icon48.png
+  content/branding/icon64.png
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
-  content/branding/icon48.png
-  content/branding/icon64.png                    (../default64.png)
   content/branding/icon128.png                   (../mozicon128.png)
   content/branding/identity-icons-brand.svg
   content/branding/aboutDialog.css

browser/branding/unofficial/content/jar.mn

@@ -9,10 +9,10 @@ browser.jar:
   content/branding/about-logo.png
   content/branding/about-logo@2x.png
   content/branding/about-wordmark.svg
+  content/branding/icon48.png
+  content/branding/icon64.png
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
-  content/branding/icon48.png
-  content/branding/icon64.png                    (../default64.png)
-  content/branding/icon128.png                   (../default128.png)
+  content/branding/icon128.png                   (../mozicon128.png)
   content/branding/identity-icons-brand.svg
   content/branding/aboutDialog.css

browser/installer/allowed-dupes.mn

@@ -76,8 +76,6 @@ browser/modules/devtools/gDevTools.jsm
 browser/chrome/icons/default/default16.png
 browser/chrome/icons/default/default32.png
 browser/chrome/icons/default/default48.png
-browser/chrome/icons/default/default64.png
-browser/chrome/icons/default/default128.png
 browser/chrome/pdfjs/content/web/images/findbarButton-next-rtl.png
 browser/chrome/pdfjs/content/web/images/findbarButton-next-rtl@2x.png
 browser/chrome/pdfjs/content/web/images/findbarButton-next.png
@@ -107,6 +105,7 @@ browser/features/flyweb@mozilla.org/chrome/skin/windows/icon-32-anchored.png
 browser/features/flyweb@mozilla.org/chrome/skin/windows/icon-32.png
 browser/features/flyweb@mozilla.org/chrome/skin/windows/icon-64-anchored.png
 browser/features/flyweb@mozilla.org/chrome/skin/windows/icon-64.png
+browser/icons/mozicon128.png
 chrome.manifest
 chrome/toolkit/skin/classic/global/autocomplete.css
 chrome/toolkit/skin/classic/global/button.css

browser/installer/package-manifest.in

@@ -615,8 +615,6 @@
 @RESPATH@/browser/chrome/icons/default/default16.png
 @RESPATH@/browser/chrome/icons/default/default32.png
 @RESPATH@/browser/chrome/icons/default/default48.png
-@RESPATH@/browser/chrome/icons/default/default64.png
-@RESPATH@/browser/chrome/icons/default/default128.png
 #endif
 @RESPATH@/browser/features/*
 
@@ -639,6 +637,8 @@
 ; shell icons
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
+; shell icons
+@RESPATH@/browser/icons/*.png
 #ifdef MOZ_UPDATER
 ; updater icon
 @RESPATH@/icons/updater.png