Add support for multiple icon sizes for Mac platform apps

chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

Index: chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
index a3d40a56dac397380f1d51ea92ad2c50eeade9b3..acaebb807300db78c620918799a652bd3c6d09d3 100644
--- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
+++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
@@ -23,6 +23,7 @@
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/image/image.h"
 
 namespace {
 const CGFloat kAnimationDuration = 0.12;
@@ -77,26 +78,27 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,
                                    Extension::EXTENSION_ICON_BITTY),
                          ImageLoadingTracker::DONT_CACHE);
     } else {
-      OnImageLoaded(NULL, icon_resource, 0);
+      OnImageLoaded(NULL, std::string(), 0);
     }
   }
 
   // ImageLoadingTracker::Observer implementation.
   // TODO(andybons): The infobar view implementations share a lot of the same
   // code. Come up with a strategy to share amongst them.
-  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 {
     if (!delegate_)
       return;  // The delegate can go away while the image asynchronously loads.
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
     // Fall back on the default extension icon on failure.
-    SkBitmap* icon;
-    if (!image || image->empty())
+    const SkBitmap* icon;
+    if (!image || image->IsEmpty())
       icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
     else
-      icon = image;
+      icon = image->ToSkBitmap();
 
     SkBitmap* drop_image = rb.GetBitmapNamed(IDR_APP_DROPARROW);