diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-06 04:43:26 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-06 04:43:26 +0000 |
| commit | 6a5fc4235fe0304ae193bf810618d1fcd1eb62fa (patch) | |
| tree | 152def0d7b8b72339b3fc80d807d66a75bd38c95 /ash/drag_drop/drag_drop_controller.h | |
| parent | e1561d6db470fb4db35315f0285f7fb0ffc56c88 (diff) | |
| download | chromium_src-6a5fc4235fe0304ae193bf810618d1fcd1eb62fa.zip chromium_src-6a5fc4235fe0304ae193bf810618d1fcd1eb62fa.tar.gz chromium_src-6a5fc4235fe0304ae193bf810618d1fcd1eb62fa.tar.bz2 | |
aura: Fix crash in DragDropController::Drop when user does a drop immediately
after starting a drag.
BUG=114242
TEST=added new test.
Review URL: http://codereview.chromium.org/9613001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125113 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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index 7f86ba5..0a7f075 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -87,7 +87,9 @@ public: scoped_ptr<DragImageView> drag_image_; const ui::OSExchangeData* drag_data_; int drag_operation_; - aura::Window* dragged_window_; + + // Window that is currently under the drag cursor. + aura::Window* drag_window_; gfx::Point drag_start_location_; bool drag_drop_in_progress_; |