Revert 132196 - Attempt to load component extension favicon from the resources first.

chrome/browser/ui/webui/extensions/extension_icon_source.cc

Index: chrome/browser/ui/webui/extensions/extension_icon_source.cc
===================================================================
--- chrome/browser/ui/webui/extensions/extension_icon_source.cc	(revision 132198)
+++ chrome/browser/ui/webui/extensions/extension_icon_source.cc	(working copy)
@@ -126,6 +126,10 @@
   if (icon.relative_path().empty()) {
     LoadIconFailed(request_id);
   } else {
+    if (request->extension->location() == Extension::COMPONENT &&
+        TryLoadingComponentExtensionImage(icon, request_id)) {
+      return;
+    }
     LoadExtensionImage(icon, request_id);
   }
 }
@@ -141,6 +145,13 @@
     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));
@@ -173,7 +184,9 @@
   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();
@@ -191,6 +204,26 @@
   FinalizeImage(&resized_image, request_id);
 }
 
+bool ExtensionIconSource::TryLoadingComponentExtensionImage(
+    const ExtensionResource& icon, int request_id) {
+  ExtensionIconRequest* request = GetData(request_id);
+  FilePath directory_path = request->extension->path();
+  FilePath relative_path = directory_path.BaseName().Append(
+      icon.relative_path());
+  for (size_t i = 0; i < kComponentExtensionResourcesSize; ++i) {
+    FilePath bm_resource_path =
+        FilePath().AppendASCII(kComponentExtensionResources[i].name);
+    bm_resource_path = bm_resource_path.NormalizePathSeparators();
+    if (relative_path == bm_resource_path) {
+      scoped_ptr<SkBitmap> decoded(LoadImageByResourceId(
+          kComponentExtensionResources[i].value));
+      FinalizeImage(decoded.get(), request_id);
+      return true;
+    }
+  }
+  return false;
+}
+
 void ExtensionIconSource::LoadExtensionImage(const ExtensionResource& icon,
                                              int request_id) {
   ExtensionIconRequest* request = GetData(request_id);
Property changes on: chrome/browser/ui/webui/extensions/extension_icon_source.cc
___________________________________________________________________
Deleted: svn:mergeinfo