Add support for multiple icon sizes for Mac platform apps

chrome/browser/extensions/extension_uninstall_dialog.h

Index: chrome/browser/extensions/extension_uninstall_dialog.h
diff --git a/chrome/browser/extensions/extension_uninstall_dialog.h b/chrome/browser/extensions/extension_uninstall_dialog.h
index a817af36fbc9397131c01bf8deab0c24a297fa5c..4af5ceac08aa05faa51fe86b00e989d6944df66e 100644
--- a/chrome/browser/extensions/extension_uninstall_dialog.h
+++ b/chrome/browser/extensions/extension_uninstall_dialog.h
@@ -56,13 +56,13 @@ class ExtensionUninstallDialog : public ImageLoadingTracker::Observer {
   SkBitmap icon_;
 
  private:
-  // Sets the icon that will be used in the dialog. If |icon| is NULL, or
-  // contains an empty bitmap, then we use a default icon instead.
-  void SetIcon(SkBitmap* icon);
+  // Sets the icon that will be used in the dialog. If |icon| is contains an

[Finnur, 2012/02/28 10:26:51]

nit: Redundant word: 'is'

[sail, 2012/02/28 23:25:36]

Done.

+  // empty bitmap, then we use a default icon instead.
+  void SetIcon(const gfx::Image& image);
 
   // ImageLoadingTracker::Observer:
-  virtual void OnImageLoaded(SkBitmap* image,
-                             const ExtensionResource& resource,
+  virtual void OnImageLoaded(const gfx::Image& image,
+                             const std::string& extension_id,
                              int index) OVERRIDE;
 
   // Displays the prompt. This should only be called after loading the icon.