Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 231 matching lines @@
 
     gfx::Image image = extension_->browser_action()->GetIcon(tab_id);
     if (!image.IsEmpty())
       SetImage(image.ToGdkPixbuf());
     bool enabled = extension_->browser_action()->GetIsVisible(tab_id);
     gtk_widget_set_sensitive(button(), enabled);
 
     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() {
     if (!extension_->ShowConfigureContextMenus())
       return NULL;
 
     context_menu_model_ =
         new ExtensionContextMenuModel(extension_, toolbar_->browser(), this);
     context_menu_.reset(
         new MenuGtk(this, context_menu_model_.get()));
@@ skipping 828 matching lines @@
 
   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                        event->time);
   return TRUE;
 }
 
 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
   if (!resize_animation_.is_animating())
     UpdateChevronVisibility();
 }