| 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;
|
|
|