| Index: views/drag_utils.cc
|
| ===================================================================
|
| --- views/drag_utils.cc (revision 50664)
|
| +++ views/drag_utils.cc (working copy)
|
| @@ -10,7 +10,6 @@
|
| #include "base/file_util.h"
|
| #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"
|
| @@ -49,8 +48,7 @@
|
| button.SetBounds(0, 0, prefsize.width(), prefsize.height());
|
|
|
| // Render the image.
|
| - // TODO(beng): Convert to CanvasSkia
|
| - gfx::Canvas canvas(prefsize.width(), prefsize.height(), false);
|
| + gfx::CanvasSkia canvas(prefsize.width(), prefsize.height(), false);
|
| button.Paint(&canvas, true);
|
| SetDragImageOnDataObject(canvas, prefsize,
|
| gfx::Point(prefsize.width() / 2, prefsize.height() / 2), data);
|
| @@ -70,8 +68,7 @@
|
| // Add +2 here to allow room for the halo.
|
| const int height = font.height() + icon->height() +
|
| kLinkDragImageVPadding + 2;
|
| - // TODO(beng): Convert to CanvasSkia
|
| - 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);
|
|
|