summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 20:40:05 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 20:40:05 +0000
commit2bc9577f09d9af3348f19c5e43651d9a417e5c7c (patch)
tree00a67d466c5d03a6e5a9fe50697c85d26e627111 /chrome/app
parent1a2b4c88a5719c84a7888136efc4088e6c2e9301 (diff)
downloadchromium_src-2bc9577f09d9af3348f19c5e43651d9a417e5c7c.zip
chromium_src-2bc9577f09d9af3348f19c5e43651d9a417e5c7c.tar.gz
chromium_src-2bc9577f09d9af3348f19c5e43651d9a417e5c7c.tar.bz2
Revert "Revert "Use a different icon for the web store under Chromium than Google Chrome.""
Took out web_store_icon.png from google_chrome directory, because it is supposed to come from DEPS. This reverts commit f4b669a21f11dbde983f6d1647e60753cd7fd8be. BUG=61019 TEST= TBR=laforge@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/theme/chromium/webstore_icon.pngbin0 -> 5426 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd2
2 files changed, 2 insertions, 0 deletions
diff --git a/chrome/app/theme/chromium/webstore_icon.png b/chrome/app/theme/chromium/webstore_icon.png
new file mode 100644
index 0000000..d661460
--- /dev/null
+++ b/chrome/app/theme/chromium/webstore_icon.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 6dbc0a2..1f066d9 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -266,6 +266,7 @@
<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" />
@@ -273,6 +274,7 @@
<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