Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2117)

Unified Diff: content/browser/web_contents/web_contents_drag_win.cc

Issue 10447053: Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/tab_icon_view.h ('k') | ui/base/dragdrop/drag_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_drag_win.cc
diff --git a/content/browser/web_contents/web_contents_drag_win.cc b/content/browser/web_contents/web_contents_drag_win.cc
index 4dbac90526b943c3b2694c3b8c39fe7cdf098c59..d154f5f8e908a2ae739bee621b7b18143c0ffa8b 100644
--- a/content/browser/web_contents/web_contents_drag_win.cc
+++ b/content/browser/web_contents/web_contents_drag_win.cc
@@ -28,6 +28,7 @@
#include "ui/base/clipboard/clipboard_util_win.h"
#include "ui/base/clipboard/custom_data_helper.h"
#include "ui/base/dragdrop/drag_utils.h"
+#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/size.h"
#include "webkit/glue/webdropdata.h"
@@ -297,8 +298,8 @@ void WebContentsDragWin::DoDragging(const WebDropData& drop_data,
// Set drag image.
if (!image.isNull()) {
- drag_utils::SetDragImageOnDataObject(
- image, gfx::Size(image.width(), image.height()), image_offset, &data);
+ drag_utils::SetDragImageOnDataObject(gfx::ImageSkia(image),
+ gfx::Size(image.width(), image.height()), image_offset, &data);
}
// We need to enable recursive tasks on the message loop so we can get
« no previous file with comments | « chrome/browser/ui/views/tab_icon_view.h ('k') | ui/base/dragdrop/drag_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698