Fixed extension icon source handling of component extensions.

chrome/browser/ui/webui/extension_icon_source.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/extension_icon_source.h"
 
 #include "base/callback.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/url_constants.h"
+#include "grit/component_extension_resources_map.h"
 #include "grit/theme_resources.h"
 #include "googleurl/src/gurl.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "webkit/glue/image_decoder.h"
 
 namespace {
@@ skipping 87 matching lines @@
   // the request data available for later.
   if (!ParseData(path, request_id)) {
     SendDefaultResponse(request_id);
     return;
   }
 
   ExtensionIconRequest* request = GetData(request_id);
   ExtensionResource icon =
       request->extension->GetIconResource(request->size, request->match);
 
-  if (icon.relative_path().empty())
+  if (icon.relative_path().empty()) {
     LoadIconFailed(request_id);
-  else
+  } else {
+    if (request->extension->location() == Extension::COMPONENT &&
+        TryLoadingComponentExtensionImage(icon, request_id)) {
+      return;
+    }
     LoadExtensionImage(icon, request_id);
+  }
 }
 
 void ExtensionIconSource::LoadIconFailed(int request_id) {
   ExtensionIconRequest* request = GetData(request_id);
   ExtensionResource icon =
       request->extension->GetIconResource(request->size, request->match);
 
   if (request->size == Extension::EXTENSION_ICON_BITTY)
     LoadFaviconImage(request_id);
   else
@@ skipping 33 matching lines @@
   else
     decoded = GetDefaultExtensionImage();
 
   *decoded = skia::ImageOperations::Resize(
       *decoded, skia::ImageOperations::RESIZE_LANCZOS3,
       request->size, request->size);
 
   FinalizeImage(decoded, 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);
+#if defined(OS_WIN)
+    bm_resource_path = bm_resource_path.NormalizeWindowsPathSeparators();
+#endif
+    if (relative_path == bm_resource_path) {

[dgozman, 2011/08/30 10:45:32]

Shouldn't you also normalize |relative_path| before comparing?

relative_path.NormalizeWindowsPathSeparators()

Or even don't normalize both?

[zel, 2011/08/30 22:16:27]

i don't think we need to do that that with relative_path since it's cooked
earlier on the stack here

+      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);
   tracker_map_[next_tracker_id_++] = request_id;
   tracker_->LoadImage(request->extension,
                       icon,
                       gfx::Size(request->size, request->size),
                       ImageLoadingTracker::DONT_CACHE);
 }
 
@@ skipping 127 matching lines @@
 
 void ExtensionIconSource::ClearData(int request_id) {
   std::map<int, ExtensionIconRequest*>::iterator i =
       request_map_.find(request_id);
   if (i == request_map_.end())
     return;
 
   delete i->second;
   request_map_.erase(i);
 }