| Index: chrome/browser/ui/webui/extensions/extension_icon_source.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/extensions/extension_icon_source.cc (revision 133434)
|
| +++ chrome/browser/ui/webui/extensions/extension_icon_source.cc (working copy)
|
| @@ -126,10 +126,6 @@
|
| if (icon.relative_path().empty()) {
|
| LoadIconFailed(request_id);
|
| } else {
|
| - if (request->extension->location() == Extension::COMPONENT &&
|
| - TryLoadingComponentExtensionImage(icon, request_id)) {
|
| - return;
|
| - }
|
| LoadExtensionImage(icon, request_id);
|
| }
|
| }
|
| @@ -204,26 +200,6 @@
|
| 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);
|
|
|