Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc |
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc |
index 8ef61ff9fa4c088395e17992845d2ddf5ebd8681..2b03b0fb318f6fb1e9215b854cd348e07d461442 100644 |
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc |
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc |
@@ -1556,7 +1556,9 @@ void LocationBarViewGtk::PageActionViewGtk::UpdateVisibility( |
} |
void LocationBarViewGtk::PageActionViewGtk::OnImageLoaded( |
- SkBitmap* image, const ExtensionResource& resource, int index) { |
+ const gfx::Image* image, |
+ const std::string& extension_id, |
+ 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()); |
@@ -1567,7 +1569,7 @@ void LocationBarViewGtk::PageActionViewGtk::OnImageLoaded( |
// 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 (image) { |
- GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(image); |
+ GdkPixbuf* pixbuf = image->ToGdkPixbuf(); |
if (index < static_cast<int>(page_action_->icon_paths()->size())) |
pixbufs_[page_action_->icon_paths()->at(index)] = pixbuf; |
else |