| Index: chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
|
| index d4051072997dc2de26861e3590c52270057329bc..48fcd3f08d97778b01af641038d8a7fce92f74e4 100644
|
| --- a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
|
| @@ -63,17 +63,20 @@ void ExtensionInfoBarGtk::GetBottomColor(InfoBarDelegate::Type type,
|
| *r = *g = *b = 218.0 / 255.0;
|
| }
|
|
|
| -void ExtensionInfoBarGtk::OnImageLoaded(
|
| - SkBitmap* image, const ExtensionResource& resource, int index) {
|
| +void ExtensionInfoBarGtk::OnImageLoaded(const gfx::Image* image,
|
| + const std::string& extension_id,
|
| + int index) {
|
| if (!delegate_)
|
| return; // The delegate can go away while we asynchronously load images.
|
|
|
| // TODO(erg): IDR_EXTENSIONS_SECTION should have an IDR_INFOBAR_EXTENSIONS
|
| // icon of the correct size with real subpixel shading and such.
|
| - SkBitmap* icon = image;
|
| + const SkBitmap* icon = NULL;
|
| ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| if (!image || image->empty())
|
| icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
|
| + else
|
| + icon = image->ToSkBitmap();
|
|
|
| SkBitmap* drop_image = rb.GetBitmapNamed(IDR_APP_DROPARROW);
|
|
|
|
|