summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 18:48:23 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 18:48:23 +0000
commitc2cf2243677d31650ae29e3fdb51fa7949514383 (patch)
tree084534840ef64bf9a83f5683945ac129237fcb5d /chrome
parent7f2d47f382820256df5b4773e7e5d5de3243e6c7 (diff)
downloadchromium_src-c2cf2243677d31650ae29e3fdb51fa7949514383.zip
chromium_src-c2cf2243677d31650ae29e3fdb51fa7949514383.tar.gz
chromium_src-c2cf2243677d31650ae29e3fdb51fa7949514383.tar.bz2
Use a different icon for the web store under Chromium than Google Chrome.
BUG=61019 TEST=Install an app on Chromium. Should see a bluish web store icon. Install on Google Chrome. Should see colorful version. Review URL: http://codereview.chromium.org/5413001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/theme/chromium/webstore_icon.pngbin0 -> 5426 bytes
-rw-r--r--chrome/app/theme/google_chrome/webstore_icon.png (renamed from chrome/browser/resources/ntp/web_store_icon.png)bin5548 -> 5548 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd2
-rw-r--r--chrome/browser/resources/ntp/apps.css2
4 files changed, 3 insertions, 1 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/browser/resources/ntp/web_store_icon.png b/chrome/app/theme/google_chrome/webstore_icon.png
index 5dffd46..5dffd46 100644
--- a/chrome/browser/resources/ntp/web_store_icon.png
+++ b/chrome/app/theme/google_chrome/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
diff --git a/chrome/browser/resources/ntp/apps.css b/chrome/browser/resources/ntp/apps.css
index 3e2f8f9..95d51f5 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("web_store_icon.png");
+ background-image: url("chrome://theme/IDR_WEBSTORE_ICON");
}
menu > button.default {