Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

Index: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index 67420301ede6bb849a4bf5f419684431f4ecd25b..8d573f7fe7d93944fc001935735e44e2ca4dfd42 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -249,9 +249,9 @@ class BrowserActionButton : public content::NotificationObserver,
     gtk_widget_queue_draw(button());
   }
 
-  SkBitmap GetIcon() {
+  gfx::ImageSkia GetIcon() {

[Jeffrey Yasskin, 2012/08/09 21:39:04]

Out of curiosity, why return ImageSkia instead of Image here?

[tbarzic, 2012/08/10 06:24:08]

Code that uses return value asks for ImageSkia, so we have to do the conversion
either here or  after this returns (line 1046).

     return *extension_->browser_action()->GetIcon(
-        toolbar_->GetCurrentTabId()).ToSkBitmap();
+        toolbar_->GetCurrentTabId()).ToImageSkia();
   }
 
   MenuGtk* GetContextMenu() {