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

Unified Diff: chrome/browser/extensions/extension_icon_image.cc

Issue 11045030: Give Chrome Web Store app an icon in its manifest file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_protocols.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_icon_image.cc
diff --git a/chrome/browser/extensions/extension_icon_image.cc b/chrome/browser/extensions/extension_icon_image.cc
index 8259861f2fd4c068467fc5b865094c3483806408..f07452afee97dfdcc84cfe18aa3e3060f0c894de 100644
--- a/chrome/browser/extensions/extension_icon_image.cc
+++ b/chrome/browser/extensions/extension_icon_image.cc
@@ -168,24 +168,22 @@ gfx::ImageSkiaRep IconImage::LoadImageForScaleFactor(
ExtensionResource resource;
// Find extension resource for non bundled component extensions.
- if (!ImageLoadingTracker::IsSpecialBundledExtensionId(extension_->id())) {
- // We try loading bigger image only if resource size is >= 32.
- if (resource_size_in_pixel >= kMatchBiggerTreshold) {
- resource = GetExtensionIconResource(extension_, icon_set_,
- resource_size_in_pixel, ExtensionIconSet::MATCH_BIGGER);
- }
-
- // If resource is not found by now, try matching smaller one.
- if (resource.empty()) {
- resource = GetExtensionIconResource(extension_, icon_set_,
- resource_size_in_pixel, ExtensionIconSet::MATCH_SMALLER);
- }
-
- // If there is no resource found, return default icon.
- if (resource.empty())
- return default_icon_.GetRepresentation(scale_factor);
+ // We try loading bigger image only if resource size is >= 32.
+ if (resource_size_in_pixel >= kMatchBiggerTreshold) {
+ resource = GetExtensionIconResource(extension_, icon_set_,
+ resource_size_in_pixel, ExtensionIconSet::MATCH_BIGGER);
}
+ // If resource is not found by now, try matching smaller one.
+ if (resource.empty()) {
+ resource = GetExtensionIconResource(extension_, icon_set_,
+ resource_size_in_pixel, ExtensionIconSet::MATCH_SMALLER);
+ }
+
+ // If there is no resource found, return default icon.
+ if (resource.empty())
+ return default_icon_.GetRepresentation(scale_factor);
+
int id = tracker_.next_id();
load_map_[id].scale_factor = scale_factor;
load_map_[id].is_async = false;
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_protocols.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698