diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 19:19:58 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 19:19:58 +0000 |
| commit | f87fa53028fd2505921909b6a8169435442228c3 (patch) | |
| tree | 1bdb132c9e3c14f2d724e6baa815fd4e84984585 /ash/drag_drop/drag_drop_controller.h | |
| parent | 911864d0d3a765716e8e1d4b0c1593cb560f98d1 (diff) | |
| download | chromium_src-f87fa53028fd2505921909b6a8169435442228c3.zip chromium_src-f87fa53028fd2505921909b6a8169435442228c3.tar.gz chromium_src-f87fa53028fd2505921909b6a8169435442228c3.tar.bz2 | |
aura: Fix a couple of drag drop issues:
1. Only DragDropController should be allowed to set the cursor while a drag-drop
session is in progress.
2. For some wierd reason I was cancelling drag-drop on MOUSE_EXITED event. That
is clearly wrong.
BUG=138694
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10825143
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop/drag_drop_controller.h')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index 22451d7..49c1aea 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -57,6 +57,7 @@ class ASH_EXPORT DragDropController const aura::LocatedEvent& event) OVERRIDE; virtual void DragCancel() OVERRIDE; virtual bool IsDragDropInProgress() OVERRIDE; + virtual gfx::NativeCursor GetDragCursor() OVERRIDE; // Overridden from aura::EventFilter: virtual bool PreHandleKeyEvent(aura::Window* target, @@ -88,6 +89,7 @@ class ASH_EXPORT DragDropController gfx::Point drag_image_offset_; const ui::OSExchangeData* drag_data_; int drag_operation_; + gfx::NativeCursor drag_cursor_; // Window that is currently under the drag cursor. aura::Window* drag_window_; |