chromeos: Fix pixelated icons in app list and launcher (part 3)

chrome/browser/extensions/extension_icon_image.cc

 // Copyright (c) 2012 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/extensions/extension_icon_image.h"
 
 #include <vector>
 
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 60 matching lines @@
   }
 
   DISALLOW_COPY_AND_ASSIGN(BlankImageSource);
 };
 
 }  // namespace
 
 namespace extensions {
 
 ////////////////////////////////////////////////////////////////////////////////
-// ExtensionIconImage::Source
+// IconImage::Source
 
 class IconImage::Source : public gfx::ImageSkiaSource {
  public:
   Source(IconImage* host, const gfx::Size& size_in_dip);
   virtual ~Source();
 
   void ResetHost();
 
  private:
   // gfx::ImageSkiaSource overrides:
@@ skipping 29 matching lines @@
   if (host_)
     representation = host_->LoadImageForScaleFactor(scale_factor);
 
   if (!representation.is_null())
     return representation;
 
   return blank_image_.GetRepresentation(scale_factor);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ExtensionIconImage
+// IconImage
 
 IconImage::IconImage(
     const Extension* extension,
     const ExtensionIconSet& icon_set,
     int resource_size_in_dip,
     const gfx::ImageSkia& default_icon,
     Observer* observer)
     : extension_(extension),
       icon_set_(icon_set),
       resource_size_in_dip_(resource_size_in_dip),
@@ skipping 17 matching lines @@
     ui::ScaleFactor scale_factor) {
   // Do nothing if extension is unloaded.
   if (!extension_)
     return gfx::ImageSkiaRep();
 
   const float scale = ui::GetScaleFactorScale(scale_factor);
   const int resource_size_in_pixel =
       static_cast<int>(resource_size_in_dip_ * scale);
 
   ExtensionResource resource;
-  // 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);
+
+  // 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);
   }
 
-  // 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;
 
   std::vector<ImageLoadingTracker::ImageRepresentation> info_list;
   info_list.push_back(ImageLoadingTracker::ImageRepresentation(
       resource,
       ImageLoadingTracker::ImageRepresentation::RESIZE_WHEN_LARGER,
       gfx::Size(resource_size_in_dip_, resource_size_in_dip_).Scale(scale),
       scale_factor));
@@ skipping 51 matching lines @@
   DCHECK_EQ(type, chrome::NOTIFICATION_EXTENSION_UNLOADED);
 
   const Extension* extension =
       content::Details<extensions::UnloadedExtensionInfo>(details)->extension;
 
   if (extension_ == extension)
     extension_ = NULL;
 }
 
 }  // namespace extensions