From 0e014221be285908ea43b5bc275127ebacde8abc Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Mon, 13 Nov 2017 15:11:55 +0900 Subject: [PATCH] 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 --- .../aurora/{default64.png => content/icon64.png} | Bin browser/branding/aurora/content/jar.mn | 6 +++--- .../aurora/{default128.png => mozicon128.png} | Bin browser/branding/branding-common.mozbuild | 4 ++-- .../nightly/{default64.png => content/icon64.png} | Bin browser/branding/nightly/content/jar.mn | 6 +++--- .../nightly/{default128.png => mozicon128.png} | Bin .../official/{default64.png => content/icon64.png} | Bin browser/branding/official/content/jar.mn | 4 ++-- .../official/{default128.png => mozicon128.png} | Bin .../{default64.png => content/icon64.png} | Bin browser/branding/unofficial/content/jar.mn | 6 +++--- .../unofficial/{default128.png => mozicon128.png} | Bin browser/installer/allowed-dupes.mn | 3 +-- browser/installer/package-manifest.in | 4 ++-- 15 files changed, 16 insertions(+), 17 deletions(-) rename browser/branding/aurora/{default64.png => content/icon64.png} (100%) rename browser/branding/aurora/{default128.png => mozicon128.png} (100%) rename browser/branding/nightly/{default64.png => content/icon64.png} (100%) rename browser/branding/nightly/{default128.png => mozicon128.png} (100%) rename browser/branding/official/{default64.png => content/icon64.png} (100%) rename browser/branding/official/{default128.png => mozicon128.png} (100%) rename browser/branding/unofficial/{default64.png => content/icon64.png} (100%) rename browser/branding/unofficial/{default128.png => mozicon128.png} (100%) diff --git a/browser/branding/aurora/default64.png b/browser/branding/aurora/content/icon64.png similarity index 100% rename from browser/branding/aurora/default64.png rename to browser/branding/aurora/content/icon64.png diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn index 9f8c5b36f943..32fb519c6f51 100644 --- a/browser/branding/aurora/content/jar.mn +++ b/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 diff --git a/browser/branding/aurora/default128.png b/browser/branding/aurora/mozicon128.png similarity index 100% rename from browser/branding/aurora/default128.png rename to browser/branding/aurora/mozicon128.png diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild index 271b259a4550..1bedc897d7a6 100644 --- a/browser/branding/branding-common.mozbuild +++ b/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', ] diff --git a/browser/branding/nightly/default64.png b/browser/branding/nightly/content/icon64.png similarity index 100% rename from browser/branding/nightly/default64.png rename to browser/branding/nightly/content/icon64.png diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn index 9f8c5b36f943..32fb519c6f51 100644 --- a/browser/branding/nightly/content/jar.mn +++ b/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 diff --git a/browser/branding/nightly/default128.png b/browser/branding/nightly/mozicon128.png similarity index 100% rename from browser/branding/nightly/default128.png rename to browser/branding/nightly/mozicon128.png diff --git a/browser/branding/official/default64.png b/browser/branding/official/content/icon64.png similarity index 100% rename from browser/branding/official/default64.png rename to browser/branding/official/content/icon64.png diff --git a/browser/branding/official/content/jar.mn b/browser/branding/official/content/jar.mn index 0a6867e22671..32fb519c6f51 100644 --- a/browser/branding/official/content/jar.mn +++ b/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 diff --git a/browser/branding/official/default128.png b/browser/branding/official/mozicon128.png similarity index 100% rename from browser/branding/official/default128.png rename to browser/branding/official/mozicon128.png diff --git a/browser/branding/unofficial/default64.png b/browser/branding/unofficial/content/icon64.png similarity index 100% rename from browser/branding/unofficial/default64.png rename to browser/branding/unofficial/content/icon64.png diff --git a/browser/branding/unofficial/content/jar.mn b/browser/branding/unofficial/content/jar.mn index 4d3cfc0fe6d5..ba53801bd27c 100644 --- a/browser/branding/unofficial/content/jar.mn +++ b/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 diff --git a/browser/branding/unofficial/default128.png b/browser/branding/unofficial/mozicon128.png similarity index 100% rename from browser/branding/unofficial/default128.png rename to browser/branding/unofficial/mozicon128.png diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index ad4d215eea7f..8877ffb62602 100644 --- a/browser/installer/allowed-dupes.mn +++ b/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 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 4e11ce8bbe6c..7d4159485e1c 100644 --- a/browser/installer/package-manifest.in +++ b/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