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 16 matching lines @@
     return ExtensionResource();
 
   return extension->GetResource(path);
 }
 
 }  // namespace
 
 namespace extensions {
 
 ////////////////////////////////////////////////////////////////////////////////
-// ExtensionIconImage::Source
+// IconImage::Source
 
 class IconImage::Source : public gfx::ImageSkiaSource {
  public:
   explicit Source(IconImage* host);
   virtual ~Source();
 
   void ResetHost();
 
  private:
   // gfx::ImageSkiaSource overrides:
@@ skipping 16 matching lines @@
 }
 
 gfx::ImageSkiaRep IconImage::Source::GetImageForScale(
     ui::ScaleFactor scale_factor) {
   if (host_)
     host_->LoadImageForScaleFactor(scale_factor);
   return gfx::ImageSkiaRep();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ExtensionIconImage
+// IconImage
 
 IconImage::IconImage(
     const Extension* extension,
     const ExtensionIconSet& icon_set,
     int resource_size_in_dip,
     Observer* observer)
     : extension_(extension),
       icon_set_(icon_set),
       resource_size_in_dip_(resource_size_in_dip),
       desired_size_in_dip_(resource_size_in_dip, resource_size_in_dip),
       observer_(observer),
       source_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
   source_ = new Source(this);
   image_skia_ = gfx::ImageSkia(source_, desired_size_in_dip_);
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::NotificationService::AllSources());
 }
 
 IconImage::~IconImage() {
   // |source_| could be NULL if resource does not exist.
   if (source_)
     source_->ResetHost();
 }
 
+void IconImage::SetRepresentation(const gfx::ImageSkiaRep& rep) {
+  image_skia_.AddRepresentation(rep);
+  if (observer_)
+    observer_->OnExtensionIconImageChanged(this);
+}
+
 void IconImage::LoadImageForScaleFactor(ui::ScaleFactor scale_factor) {
   // Do nothing if extension is unloaded.
   if (!extension_)
     return;
 
   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);
-  }
 
-  // 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);
-  }
+  // Find extension resource for non bundled component extensions.
+  if (!ImageLoadingTracker::IsSpecialBundledExtensionId(extension_->id())) {

[Aaron Boodman, 2012/08/30 06:09:20]

I hate this hack so much. It's probably a different project, but it would be
good if we could pull knowledge of component extensions out of this class.

+    // 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 there is no resource found, bail out and notify observer of failure.
-  if (resource.empty()) {
-    if (observer_)
-      observer_->OnIconImageLoadFailed(this, scale_factor);
-    return;
+    // 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, bail out and notify observer of failure.
+    if (resource.empty()) {
+      if (observer_)
+        observer_->OnIconImageLoadFailed(this, scale_factor);
+      return;
+    }
   }
 
   int id = tracker_.next_id();
   load_map_[id] = scale_factor;
 
   std::vector<ImageLoadingTracker::ImageRepresentation> info_list;
   info_list.push_back(ImageLoadingTracker::ImageRepresentation(
       resource,
       ImageLoadingTracker::ImageRepresentation::RESIZE_WHEN_LARGER,
       desired_size_in_dip_.Scale(scale),
@@ skipping 33 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