Move Web Store icon special case, so that it can be subjected to grayscaling.

BUG=103271
TEST=Open NTP and disable network. Web Store icon should be desaturated and gray.


Review URL: http://codereview.chromium.org/8479044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109269 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 4 deletions

diff --git a/chrome/browser/ui/webui/extension_icon_source.cc b/chrome/browser/ui/webui/extension_icon_source.cc
index 81b0c833..d40b799 100644
--- a/chrome/browser/ui/webui/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extension_icon_source.cc
@@ -80,9 +80,6 @@ GURL ExtensionIconSource::GetIconURL(const Extension* extension,
                                      bool* exists) {
   if (exists)
     *exists = true;
-  if (extension->id() == extension_misc::kWebStoreAppId)
-    return GURL("chrome://theme/IDR_WEBSTORE_ICON");
-
   if (exists && extension->GetIconURL(icon_size, match) == GURL())
     *exists = false;
 
@@ -149,6 +146,13 @@ void ExtensionIconSource::LoadIconFailed(int request_id) {
     LoadDefaultImage(request_id);
 }
 
+const SkBitmap* ExtensionIconSource::GetWebStoreImage() {
+  if (!web_store_icon_data_.get())
+    web_store_icon_data_.reset(LoadImageByResourceId(IDR_WEBSTORE_ICON));
+
+  return web_store_icon_data_.get();
+}
+
 const SkBitmap* ExtensionIconSource::GetDefaultAppImage() {
   if (!default_app_data_.get())
     default_app_data_.reset(LoadImageByResourceId(IDR_APP_DEFAULT_ICON));
@@ -178,7 +182,9 @@ void ExtensionIconSource::LoadDefaultImage(int request_id) {
   ExtensionIconRequest* request = GetData(request_id);
   const SkBitmap* default_image = NULL;
 
-  if (request->extension->is_app())
+  if (request->extension->id() == extension_misc::kWebStoreAppId)
+    default_image = GetWebStoreImage();
+  else if (request->extension->is_app())
     default_image = GetDefaultAppImage();
   else
     default_image = GetDefaultExtensionImage();