summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 20:16:46 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 20:16:46 +0000
commit3909af1b92e1f04a3626f97cbffc0a64255fe6e6 (patch)
treecf4861da3f658f54be4b474ce3dc2835c108057c
parent981c1c5d6f46c1435bbcf466e35a8aa047a367a9 (diff)
downloadchromium_src-3909af1b92e1f04a3626f97cbffc0a64255fe6e6.zip
chromium_src-3909af1b92e1f04a3626f97cbffc0a64255fe6e6.tar.gz
chromium_src-3909af1b92e1f04a3626f97cbffc0a64255fe6e6.tar.bz2
Revert "Use a different icon for the web store under Chromium than Google Chrome."
This reverts commit 9dac844f46dd3263a04854668a60489d8633e587. TBR=erikkay@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67892 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/theme/chromium/webstore_icon.pngbin5426 -> 0 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd2
-rw-r--r--chrome/browser/resources/ntp/apps.css2
-rw-r--r--chrome/browser/resources/ntp/web_store_icon.png (renamed from chrome/app/theme/google_chrome/webstore_icon.png)bin5548 -> 5548 bytes
4 files changed, 1 insertions, 3 deletions
diff --git a/chrome/app/theme/chromium/webstore_icon.png b/chrome/app/theme/chromium/webstore_icon.png
deleted file mode 100644
index d661460..0000000
--- a/chrome/app/theme/chromium/webstore_icon.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 1f066d9..6dbc0a2 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -266,7 +266,6 @@
<include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" type="BINDATA" />
<include name="IDR_CUSTOM_PRODUCT_LOGO" file="google_chrome/alt_logo.gif" type="BINDATA" />
- <include name="IDR_WEBSTORE_ICON" file="google_chrome/webstore_icon.png" type="BINDATA" />
</if>
<if expr="not pp_ifdef('_google_chrome')">
<include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" />
@@ -274,7 +273,6 @@
<include name="IDR_PRODUCT_LOGO_WHITE" file="chromium/product_logo_white.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" type="BINDATA" />
<include name="IDR_CUSTOM_PRODUCT_LOGO" file="chromium/product_logo.png" type="BINDATA" />
- <include name="IDR_WEBSTORE_ICON" file="chromium/webstore_icon.png" type="BINDATA" />
</if>
<!-- NOTE: product_logo_*.* files beyond what's listed above are
referenced by installer code; don't remove them unless you know what
diff --git a/chrome/browser/resources/ntp/apps.css b/chrome/browser/resources/ntp/apps.css
index 95d51f5..3e2f8f9 100644
--- a/chrome/browser/resources/ntp/apps.css
+++ b/chrome/browser/resources/ntp/apps.css
@@ -113,7 +113,7 @@ html[install-animation-enabled=true] .app[new=installed] {
}
.app[app-id=web-store-entry] > a {
- background-image: url("chrome://theme/IDR_WEBSTORE_ICON");
+ background-image: url("web_store_icon.png");
}
menu > button.default {
diff --git a/chrome/app/theme/google_chrome/webstore_icon.png b/chrome/browser/resources/ntp/web_store_icon.png
index 5dffd46..5dffd46 100644
--- a/chrome/app/theme/google_chrome/webstore_icon.png
+++ b/chrome/browser/resources/ntp/web_store_icon.png
Binary files differ