Canvas refactoring part 2....

views/drag_utils.cc

Index: views/drag_utils.cc
===================================================================
--- views/drag_utils.cc	(revision 50452)
+++ views/drag_utils.cc	(working copy)
@@ -11,6 +11,7 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
@@ -48,9 +49,9 @@
   button.SetBounds(0, 0, prefsize.width(), prefsize.height());
 
   // Render the image.
-  gfx::Canvas canvas(prefsize.width(), prefsize.height(), false);
-  button.Paint(&canvas, true);
-  SetDragImageOnDataObject(canvas, prefsize,
+  gfx::CanvasSkia canvas(prefsize.width(), prefsize.height(), false);
+  button.Paint(canvas.AsCanvas(), true);
+  SetDragImageOnDataObject(*canvas.AsCanvas(), prefsize,
       gfx::Point(prefsize.width() / 2, prefsize.height() / 2), data);
 }
 
@@ -68,7 +69,7 @@
   // Add +2 here to allow room for the halo.
   const int height = font.height() + icon->height() +
                      kLinkDragImageVPadding + 2;
-  gfx::Canvas canvas(width, height, false /* translucent */);
+  gfx::CanvasSkia canvas(width, height, false /* translucent */);
 
   // Paint the icon.
   canvas.DrawBitmapInt(*icon, (width - icon->width()) / 2, 0);
@@ -87,7 +88,7 @@
                        width, font.height(), gfx::Canvas::TEXT_ALIGN_CENTER);
 #endif
 
-  SetDragImageOnDataObject(canvas, gfx::Size(width, height),
+  SetDragImageOnDataObject(*canvas.AsCanvas(), gfx::Size(width, height),
                            gfx::Point(width / 2, kLinkDragImageVPadding),
                            data_object);
 }