diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 07:12:22 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 07:12:22 +0000 |
commit | 16f17f5edd89d6b6a41709a9946a0183f5754c35 (patch) | |
tree | 1f887f3366390790c28f7b6b92a77f64994e48e6 /views/drag_utils_gtk.cc | |
parent | b9a4ea7fbdc54868b60d50bc5fade451718dec23 (diff) | |
download | chromium_src-16f17f5edd89d6b6a41709a9946a0183f5754c35.zip chromium_src-16f17f5edd89d6b6a41709a9946a0183f5754c35.tar.gz chromium_src-16f17f5edd89d6b6a41709a9946a0183f5754c35.tar.bz2 |
Chrome/win: Show preview images when dragging images.
BUG=11457
TEST=Go to google.com, drag logo around. Should be attached to cursor.
Review URL: http://codereview.chromium.org/2870026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/drag_utils_gtk.cc')
-rw-r--r-- | views/drag_utils_gtk.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/views/drag_utils_gtk.cc b/views/drag_utils_gtk.cc index a22b0cf..8ab044b 100644 --- a/views/drag_utils_gtk.cc +++ b/views/drag_utils_gtk.cc @@ -13,18 +13,18 @@ #include "gfx/gtk_util.h" #include "gfx/point.h" #include "gfx/size.h" +#include "third_party/skia/include/core/SkBitmap.h" namespace drag_utils { -void SetDragImageOnDataObject(const gfx::Canvas& canvas, +void SetDragImageOnDataObject(const SkBitmap& bitmap, const gfx::Size& size, const gfx::Point& cursor_offset, OSExchangeData* data_object) { OSExchangeDataProviderGtk& provider( static_cast<OSExchangeDataProviderGtk&>(data_object->provider())); - // Convert the canvas into a GdkPixbuf. - SkBitmap bitmap = canvas.ExtractBitmap(); + // Convert the bitmap into a GdkPixbuf. GdkPixbuf* canvas_pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap); // Make a new pixbuf of the requested size and copy it over. |