Canvas refactoring part 2....

chrome/browser/views/infobars/extension_infobar.cc

 // Copyright (c) 2010 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/views/infobars/extension_infobar.h"
 
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
-#include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/widget/widget.h"
 
 // The horizontal margin between the menu and the Extension (HTML) view.
 static const int kMenuHorizontalMargin = 1;
 
 // The amount of space to the right of the Extension (HTML) view (to avoid
 // overlapping the close button for the InfoBar).
@@ skipping 81 matching lines @@
   // We fall back on the default extension icon on failure.
   SkBitmap* icon;
   if (!image || image->empty())
     icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
   else
     icon = image;
 
   SkBitmap* drop_image = rb.GetBitmapNamed(IDR_APP_DROPARROW);
 
   int image_size = Extension::EXTENSION_ICON_BITTY;
-  scoped_ptr<gfx::Canvas> canvas(
-      new gfx::Canvas(image_size + kDropArrowLeftMargin + drop_image->width(),
-      image_size, false));
+  scoped_ptr<gfx::CanvasSkia> canvas(
+      new gfx::CanvasSkia(
+          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 33 matching lines @@
     tracker_.LoadImage(extension, icon_resource, gfx::Size(size, size),
                        ImageLoadingTracker::DONT_CACHE);
   } else {
     OnImageLoaded(NULL, icon_resource, 0);  // |image|, |index|.
   }
 }
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar() {
   return new ExtensionInfoBar(this);
 }