| 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 31548aae7ca1eb6139999ea8f2cdded4c9386720..0788945c2980cfcd5eef8258daf20971d93a1e6d 100644
|
| --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
|
| @@ -39,6 +39,7 @@
|
| #include "ui/base/gtk/gtk_compat.h"
|
| #include "ui/gfx/canvas_skia_paint.h"
|
| #include "ui/gfx/gtk_util.h"
|
| +#include "ui/gfx/image/image.h"
|
|
|
| namespace {
|
|
|
| @@ -160,11 +161,12 @@ class BrowserActionButton : public content::NotificationObserver,
|
| }
|
|
|
| // ImageLoadingTracker::Observer implementation.
|
| - void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
|
| - int index) {
|
| - if (image) {
|
| - default_skbitmap_ = *image;
|
| - default_icon_ = gfx::GdkPixbufFromSkBitmap(image);
|
| + void OnImageLoaded(const gfx::Image& image,
|
| + const std::string& extension_id,
|
| + int index) OVERRIDE {
|
| + if (!image.IsEmpty()) {
|
| + default_skbitmap_ = *image.ToSkBitmap();
|
| + default_icon_ = image.ToGdkPixbuf();
|
| }
|
| UpdateState();
|
| }
|
|
|