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

chrome/browser/ui/ash/app_list/extension_app_item.h

Index: chrome/browser/ui/ash/app_list/extension_app_item.h
diff --git a/chrome/browser/ui/ash/app_list/extension_app_item.h b/chrome/browser/ui/ash/app_list/extension_app_item.h
index 8e4af4ab2655e55da27c740079e4bc86d991848d..fef90c7118310e94fd9be459f6658215748b02d9 100644
--- a/chrome/browser/ui/ash/app_list/extension_app_item.h
+++ b/chrome/browser/ui/ash/app_list/extension_app_item.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/extensions/image_loading_tracker.h"
+#include "chrome/browser/extensions/extension_icon_image.h"
 #include "chrome/browser/ui/ash/app_list/chrome_app_list_item.h"
 #include "ui/base/models/simple_menu_model.h"
 
@@ -23,7 +23,7 @@ class Extension;
 
 // ExtensionAppItem represents an extension app in app list.
 class ExtensionAppItem : public ChromeAppListItem,
-                         public ImageLoadingTracker::Observer,
+                         public extensions::IconImage::Observer,
                          public ui::SimpleMenuModel::Delegate {
  public:
   ExtensionAppItem(Profile* profile,
@@ -46,10 +46,11 @@ class ExtensionAppItem : public ChromeAppListItem,
   void ShowExtensionOptions();
   void StartExtensionUninstall();
 
-  // Overridden from ImageLoadingTracker::Observer:
-  virtual void OnImageLoaded(const gfx::Image& image,
-                             const std::string& extension_id,
-                             int tracker_index) OVERRIDE;
+  // Overridden from extensions::IconImage::Observer:
+  virtual void OnExtensionIconImageChanged(
+      extensions::IconImage* image) OVERRIDE;
+  virtual void OnIconImageLoadFailed(extensions::IconImage* image,
+                                     ui::ScaleFactor scale_factor) OVERRIDE;
 
   // Overridden from ui::SimpleMenuModel::Delegate:
   virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
@@ -69,7 +70,7 @@ class ExtensionAppItem : public ChromeAppListItem,
   const std::string extension_id_;
   AppListController* controller_;
 
-  scoped_ptr<ImageLoadingTracker> tracker_;
+  scoped_ptr<extensions::IconImage> icon_;
   scoped_ptr<ui::SimpleMenuModel> context_menu_model_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionAppItem);