Add support for multiple icon sizes for Mac platform apps

chrome/browser/background/background_application_list_model.cc

Index: chrome/browser/background/background_application_list_model.cc
diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc
index 58c815e1574f4d698719a8c8acd86c5a2b397eb2..dfb4a2d9792d33eb4d2795acf01aeab632b7767e 100644
--- a/chrome/browser/background/background_application_list_model.cc
+++ b/chrome/browser/background/background_application_list_model.cc
@@ -23,6 +23,7 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/l10n/l10n_util_collator.h"
+#include "ui/gfx/image/image.h"
 
 class ExtensionNameComparator {
  public:
@@ -55,9 +56,9 @@ class BackgroundApplicationListModel::Application
   virtual ~Application();
 
   // Invoked when a request icon is available.
-  virtual void OnImageLoaded(SkBitmap* image,
-                             const ExtensionResource& resource,
-                             int index);
+  virtual void OnImageLoaded(const gfx::Image& image,
+                             const std::string& extension_id,
+                             int index) OVERRIDE;
 
   // Uses the FILE thread to request this extension's icon, sized
   // appropriately.
@@ -129,12 +130,12 @@ BackgroundApplicationListModel::Application::Application(
 }
 
 void BackgroundApplicationListModel::Application::OnImageLoaded(
-    SkBitmap* image,
-    const ExtensionResource& resource,
+    const gfx::Image& image,
+    const std::string& extension_id,
     int index) {
-  if (!image)
+  if (image.IsEmpty())
     return;
-  icon_.reset(new SkBitmap(*image));
+  icon_.reset(image.CopySkBitmap());
   model_->SendApplicationDataChangedNotifications(extension_);
 }