summaryrefslogtreecommitdiffstats
path: root/ui/views/button_drag_utils.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 00:30:59 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 00:30:59 +0000
commit94a0d258287787cf09854492ce889eb14273c059 (patch)
treeff242b01f90ee3888fd10a1583b03268b9a15eb0 /ui/views/button_drag_utils.cc
parentfbddf8352b68292d26191060d37c3f0820c8875c (diff)
downloadchromium_src-94a0d258287787cf09854492ce889eb14273c059.zip
chromium_src-94a0d258287787cf09854492ce889eb14273c059.tar.gz
chromium_src-94a0d258287787cf09854492ce889eb14273c059.tar.bz2
ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.
The final goal is to merge these two classes into a single gfx::Canvas class. BUG=116572 R=ben@chromium.org,asvitkine@chromium.org TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9562038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/button_drag_utils.cc')
-rw-r--r--ui/views/button_drag_utils.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/button_drag_utils.cc b/ui/views/button_drag_utils.cc
index 5753fdc..d65bc29 100644
--- a/ui/views/button_drag_utils.cc
+++ b/ui/views/button_drag_utils.cc
@@ -10,7 +10,7 @@
#include "ui/base/dragdrop/drag_utils.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/canvas.h"
#include "ui/gfx/image/image.h"
#include "ui/views/controls/button/text_button.h"
@@ -41,7 +41,7 @@ void SetURLAndDragImage(const GURL& url,
button.SetBounds(0, 0, prefsize.width(), prefsize.height());
// Render the image.
- gfx::CanvasSkia canvas(prefsize, false);
+ gfx::Canvas canvas(prefsize, false);
button.PaintButton(&canvas, views::TextButton::PB_FOR_DRAG);
drag_utils::SetDragImageOnDataObject(canvas, prefsize,
gfx::Point(prefsize.width() / 2, prefsize.height() / 2), data);