Index: chrome/views/view_win.cc |
=================================================================== |
--- chrome/views/view_win.cc (revision 11663) |
+++ chrome/views/view_win.cc (working copy) |
@@ -6,6 +6,7 @@ |
#include "base/scoped_handle.h" |
#include "base/string_util.h" |
+#include "chrome/common/drag_drop_types.h" |
#include "chrome/common/gfx/chrome_canvas.h" |
#include "chrome/common/gfx/path.h" |
#include "chrome/common/os_exchange_data.h" |
@@ -29,14 +30,17 @@ |
} |
void View::DoDrag(const MouseEvent& e, int press_x, int press_y) { |
+ int drag_operations = GetDragOperations(press_x, press_y); |
+ if (drag_operations == DragDropTypes::DRAG_NONE) |
+ return; |
+ |
scoped_refptr<OSExchangeData> data = new OSExchangeData; |
WriteDragData(press_x, press_y, data.get()); |
// Message the RootView to do the drag and drop. That way if we're removed |
// the RootView can detect it and avoid calling us back. |
RootView* root_view = GetRootView(); |
- root_view->StartDragForViewFromMouseEvent( |
- this, data, GetDragOperations(press_x, press_y)); |
+ root_view->StartDragForViewFromMouseEvent(this, data, drag_operations); |
} |
AccessibleWrapper* View::GetAccessibleWrapper() { |