Add support for multiple icon sizes for Mac platform apps

chrome/browser/ui/gtk/infobars/extension_infobar_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/infobars/extension_infobar_gtk.h"
 
 #include "base/debug/trace_event.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/platform_util.h"
@@ skipping 45 matching lines @@
                                       double* r, double* g, double* b) {
   // Extension infobars are always drawn with chrome-theme colors.
   *r = *g = *b = 233.0 / 255.0;
 }
 
 void ExtensionInfoBarGtk::GetBottomColor(InfoBarDelegate::Type type,
                                          double* r, double* g, double* b) {
   *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);
 
   int image_size = Extension::EXTENSION_ICON_BITTY;
   // The margin between the extension icon and the drop-down arrow bitmap.
   static const int kDropArrowLeftMargin = 3;
   scoped_ptr<gfx::CanvasSkia> canvas(new gfx::CanvasSkia(
       gfx::Size(image_size + kDropArrowLeftMargin + drop_image->width(),
                 image_size),
       false));
@@ skipping 111 matching lines @@
   // We also need to draw our infobar arrows over the renderer.
   static_cast<InfoBarContainerGtk*>(container())->
       PaintInfobarBitsOn(sender, event, this);
 
   return FALSE;
 }
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {
   return new ExtensionInfoBarGtk(owner, this);
 }