Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/infobars/extension_infobar.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/views/infobars/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/platform_util.h"
@@ skipping 90 matching lines @@
 int ExtensionInfoBar::ContentMinimumWidth() const {
   return menu_->GetPreferredSize().width() + kMenuHorizontalMargin;
 }
 
 void ExtensionInfoBar::OnImageLoaded(const gfx::Image& image,
                                      const std::string& extension_id,
                                      int index) {
   if (!GetDelegate())
     return;  // The delegate can go away while we asynchronously load images.
 
-  const SkBitmap* icon = NULL;
+  const gfx::ImageSkia* icon = NULL;
   // Fall back on the default extension icon on failure.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (image.IsEmpty())
-    icon = rb.GetImageNamed(IDR_EXTENSIONS_SECTION).ToSkBitmap();
+    icon = rb.GetImageNamed(IDR_EXTENSIONS_SECTION).ToImageSkia();
   else
-    icon = image.ToSkBitmap();
+    icon = image.ToImageSkia();
 
-  const SkBitmap* drop_image = rb.GetImageNamed(IDR_APP_DROPARROW).ToSkBitmap();
+  const gfx::ImageSkia* drop_image =
+      rb.GetImageNamed(IDR_APP_DROPARROW).ToImageSkia();
 
   int image_size = ExtensionIconSet::EXTENSION_ICON_BITTY;
-  // The margin between the extension icon and the drop-down arrow bitmap.
+  // The margin between the extension icon and the drop-down arrow image.
   static const int kDropArrowLeftMargin = 3;
   scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(
       gfx::Size(image_size + kDropArrowLeftMargin + drop_image->width(),
                 image_size), false));
   canvas->DrawBitmapInt(*icon, 0, 0, icon->width(), icon->height(), 0, 0,
                         image_size, image_size, false);
   canvas->DrawBitmapInt(*drop_image, image_size + kDropArrowLeftMargin,
                         image_size / 2);
   menu_->SetIcon(canvas->ExtractBitmap());
   menu_->SetVisible(true);
@@ skipping 16 matching lines @@
 
   scoped_refptr<ExtensionContextMenuModel> options_menu_contents =
       new ExtensionContextMenuModel(extension, browser_);
   DCHECK_EQ(menu_, source);
   RunMenuAt(options_menu_contents.get(), menu_, views::MenuItemView::TOPLEFT);
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
   return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }