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

chrome/browser/ui/app_list/extension_app_item.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/ui/app_list/extension_app_item.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 133 matching lines @@
 
 bool ExtensionAppItem::IsTalkExtension() const {
   // Test most likely version first.
   return extension_id_ == extension_misc::kTalkExtensionId ||
       extension_id_ == extension_misc::kTalkBetaExtensionId ||
       extension_id_ == extension_misc::kTalkAlphaExtensionId ||
       extension_id_ == extension_misc::kTalkDebugExtensionId;
 }
 
 void ExtensionAppItem::LoadImage(const Extension* extension) {
-  tracker_.reset(new ImageLoadingTracker(this));
-  tracker_->LoadImage(extension,
-                      extension->GetIconResource(
-                          extension_misc::EXTENSION_ICON_LARGE,
-                          ExtensionIconSet::MATCH_BIGGER),
-                      gfx::Size(extension_misc::EXTENSION_ICON_LARGE,
-                                extension_misc::EXTENSION_ICON_LARGE),
-                      ImageLoadingTracker::DONT_CACHE);
+  icon_.reset(new extensions::IconImage(
+      extension,
+      extension->icons(),
+      extension_misc::EXTENSION_ICON_MEDIUM,
+      Extension::GetDefaultIcon(true),
+      this));
+  SetIcon(icon_->image_skia());
 }
 
 void ExtensionAppItem::ShowExtensionOptions() {
   const Extension* extension = GetExtension();
   if (!extension)
     return;
 
   chrome::NavigateParams params(profile_,
                                 extension->options_url(),
                                 content::PAGE_TRANSITION_LINK);
@@ skipping 11 matching lines @@
   chrome::Navigate(&params);
 }
 
 void ExtensionAppItem::StartExtensionUninstall() {
   // ExtensionUninstall deletes itself when done or aborted.
   ExtensionUninstaller* uninstaller = new ExtensionUninstaller(profile_,
                                                                extension_id_);
   uninstaller->Run();
 }
 
-void ExtensionAppItem::OnImageLoaded(const gfx::Image& image,
-                                     const std::string& extension_id,
-                                     int tracker_index) {
-  if (!image.IsEmpty()) {
-    gfx::ImageSkia image_skia = *image.ToImageSkia();
-    image_skia.MakeThreadSafe();
-    SetIcon(image_skia);
-  } else {
-    gfx::ImageSkia image_skia(Extension::GetDefaultIcon(true /* is_app */));
-    image_skia.MakeThreadSafe();
-    SetIcon(image_skia);
-  }
+void ExtensionAppItem::OnExtensionIconImageChanged(
+    extensions::IconImage* image) {
+  DCHECK(icon_.get() == image);
+  SetIcon(icon_->image_skia());
 }
 
 bool ExtensionAppItem::IsItemForCommandIdDynamic(int command_id) const {
   return command_id == TOGGLE_PIN;
 }
 
 string16 ExtensionAppItem::GetLabelForCommandId(int command_id) const {
   if (command_id == TOGGLE_PIN) {
     return controller_->IsAppPinned(extension_id_) ?
         l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_UNPIN) :
@@ skipping 115 matching lines @@
     }
     context_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
     context_menu_model_->AddItemWithStringId(OPTIONS, IDS_NEW_TAB_APP_OPTIONS);
     context_menu_model_->AddItemWithStringId(DETAILS, IDS_NEW_TAB_APP_DETAILS);
     context_menu_model_->AddItemWithStringId(UNINSTALL,
                                              IDS_EXTENSIONS_UNINSTALL);
   }
 
   return context_menu_model_.get();
 }