Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1541)

Unified Diff: chrome/browser/ui/webui/extensions/extension_icon_source.cc

Issue 9979001: Attempt to load component extension favicon from the resources first. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/extensions/extension_icon_source.cc
===================================================================
--- chrome/browser/ui/webui/extensions/extension_icon_source.cc (revision 130900)
+++ 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);

Powered by Google App Engine
This is Rietveld 408576698