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

Unified Diff: chrome/browser/gtk/tab_contents_drag_source.cc

Issue 174364: Plumb the DragOperation through all the layers between the platform DnD code ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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/gtk/tab_contents_drag_source.h ('k') | chrome/browser/renderer_host/render_view_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/tab_contents_drag_source.cc
===================================================================
--- chrome/browser/gtk/tab_contents_drag_source.cc (revision 25321)
+++ chrome/browser/gtk/tab_contents_drag_source.cc (working copy)
@@ -12,6 +12,9 @@
#include "chrome/common/gtk_util.h"
#include "webkit/glue/webdropdata.h"
+using WebKit::WebDragOperation;
+using WebKit::WebDragOperationNone;
+
TabContentsDragSource::TabContentsDragSource(
TabContentsView* tab_contents_view)
: tab_contents_view_(tab_contents_view),
@@ -170,15 +173,16 @@
gfx::Point client = gtk_util::ClientPoint(GetContentNativeView());
if (tab_contents()->render_view_host()) {
- tab_contents()->render_view_host()->DragSourceCancelledAt(
- client.x(), client.y(), root.x(), root.y());
+ tab_contents()->render_view_host()->DragSourceEndedAt(
+ client.x(), client.y(), root.x(), root.y(),
+ WebDragOperationNone);
}
// Let the native failure animation run.
return FALSE;
}
-void TabContentsDragSource::OnDragEnd() {
+void TabContentsDragSource::OnDragEnd(WebDragOperation operation) {
MessageLoopForUI::current()->RemoveObserver(this);
if (!drag_failed_) {
@@ -187,7 +191,7 @@
if (tab_contents()->render_view_host()) {
tab_contents()->render_view_host()->DragSourceEndedAt(
- client.x(), client.y(), root.x(), root.y());
+ client.x(), client.y(), root.x(), root.y(), operation);
}
}
« no previous file with comments | « chrome/browser/gtk/tab_contents_drag_source.h ('k') | chrome/browser/renderer_host/render_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698