Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/gtk/location_bar_view_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/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1775 matching lines @@
   current_url_ = url;
 
   bool visible = contents &&
       (preview_enabled_ || page_action_->GetIsVisible(current_tab_id_));
   if (visible) {
     // Set the tooltip.
     gtk_widget_set_tooltip_text(event_box_.get(),
         page_action_->GetTitle(current_tab_id_).c_str());
 
     // Set the image.
-    gfx::Image icon = page_action_->GetIcon(current_tab_id_);
-    if (!icon.IsEmpty()) {
-      GdkPixbuf* pixbuf = icon.ToGdkPixbuf();
+    gfx::ImageSkia icon = page_action_->GetIcon(current_tab_id_);
+    if (!icon.empty()) {
+      GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(*icon.bitmap());
       DCHECK(pixbuf);
       gtk_image_set_from_pixbuf(GTK_IMAGE(image_.get()), pixbuf);
     }
   }
 
   bool old_visible = IsVisible();
   if (visible)
     gtk_widget_show_all(event_box_.get());
   else
     gtk_widget_hide_all(event_box_.get());
@@ skipping 12 matching lines @@
     int index) {
   // We loaded icons()->size() icons, plus one extra if the page action had
   // a default icon.
   int total_icons = static_cast<int>(page_action_->icon_paths()->size());
   if (!page_action_->default_icon_path().empty())
     total_icons++;
   DCHECK(index < total_icons);
 
   // Map the index of the loaded image back to its name. If we ever get an
   // index greater than the number of icons, it must be the default icon.
-  if (index < static_cast<int>(page_action_->icon_paths()->size()))
-    page_action_->CacheIcon(page_action_->icon_paths()->at(index), image);
-  else
-    page_action_->CacheIcon(page_action_->default_icon_path(), image);
+  if (index < static_cast<int>(page_action_->icon_paths()->size())) {
+    page_action_->CacheIcon(page_action_->icon_paths()->at(index),
+                            *image.ToImageSkia());
+  } else {
+    page_action_->CacheIcon(page_action_->default_icon_path(),
+                            *image.ToImageSkia());
+  }
 
   // If we have no owner, that means this class is still being constructed.
   TabContents* tab_contents = owner_ ? owner_->GetTabContents() : NULL;
   if (tab_contents)
     UpdateVisibility(tab_contents->web_contents(), current_url_);
 }
 
 void LocationBarViewGtk::PageActionViewGtk::TestActivatePageAction() {
   GdkEventButton event = {};
   event.button = 1;
@@ skipping 207 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }