Add support for multiple icon sizes for Mac platform apps

chrome/browser/ui/views/browser_actions_container.cc

Index: chrome/browser/ui/views/browser_actions_container.cc
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 7158c587e0586e23b050908ff9ead8ee9e79360c..bac2747bd17c661a973f0bf3778a2174bef8ad4a 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -42,6 +42,7 @@
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/menu/menu_item_view.h"
@@ -118,11 +119,11 @@ void BrowserActionButton::ButtonPressed(views::Button* sender,
   panel_->OnBrowserActionExecuted(this, false);
 }
 
-void BrowserActionButton::OnImageLoaded(SkBitmap* image,
-                                        const ExtensionResource& resource,
+void BrowserActionButton::OnImageLoaded(const gfx::Image* image,
+                                        const std::string& extension_id,
                                         int index) {
   if (image)
-    default_icon_ = *image;
+    default_icon_ = *image->ToSkBitmap();
 
   // Call back to UpdateState() because a more specific icon might have been set
   // while the load was outstanding.