From 3909af1b92e1f04a3626f97cbffc0a64255fe6e6 Mon Sep 17 00:00:00 2001
From: "aa@chromium.org" <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 1 Dec 2010 20:16:46 +0000
Subject: 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
---
 chrome/app/theme/chromium/webstore_icon.png      | Bin 5426 -> 0 bytes
 chrome/app/theme/google_chrome/webstore_icon.png | Bin 5548 -> 0 bytes
 chrome/app/theme/theme_resources.grd             |   2 --
 chrome/browser/resources/ntp/apps.css            |   2 +-
 chrome/browser/resources/ntp/web_store_icon.png  | Bin 0 -> 5548 bytes
 5 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 chrome/app/theme/chromium/webstore_icon.png
 delete mode 100644 chrome/app/theme/google_chrome/webstore_icon.png
 create mode 100644 chrome/browser/resources/ntp/web_store_icon.png

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
Binary files a/chrome/app/theme/chromium/webstore_icon.png and /dev/null differ
diff --git a/chrome/app/theme/google_chrome/webstore_icon.png b/chrome/app/theme/google_chrome/webstore_icon.png
deleted file mode 100644
index 5dffd46..0000000
Binary files a/chrome/app/theme/google_chrome/webstore_icon.png and /dev/null 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/browser/resources/ntp/web_store_icon.png b/chrome/browser/resources/ntp/web_store_icon.png
new file mode 100644
index 0000000..5dffd46
Binary files /dev/null and b/chrome/browser/resources/ntp/web_store_icon.png differ
-- 
cgit v1.1