diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-01 14:05:10 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-01 14:05:10 +0000 |
| commit | 7ddcd4293d9ad4336dbaebd102af12c1690abd68 (patch) | |
| tree | c3cf01f88cfa7eace22c00b6c49fb22fecf19502 /ash/drag_drop/drag_drop_controller.cc | |
| parent | 4aedf2df4153b0deb3b7d9139e7daf854c1e31c7 (diff) | |
| download | chromium_src-7ddcd4293d9ad4336dbaebd102af12c1690abd68.zip chromium_src-7ddcd4293d9ad4336dbaebd102af12c1690abd68.tar.gz chromium_src-7ddcd4293d9ad4336dbaebd102af12c1690abd68.tar.bz2 | |
ash: SystemGestureEventFilter should not process gestures while a drag drop is
in progress.
BUG=236493
Review URL: https://chromiumcodereview.appspot.com/14184010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop/drag_drop_controller.cc')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 933c0d1..90d3010 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -226,6 +226,12 @@ int DragDropController::StartDragAndDrop( if (cancel_animation_) cancel_animation_->End(); + // Become the first event handler since we should get first shot at handling + // any events during the drag drop session. + Shell::GetInstance()->RemovePreTargetHandler(this); + Shell::GetInstance()->PrependPreTargetHandler(this); + + #if !defined(OS_MACOSX) if (should_block_during_drag_drop_) { base::RunLoop run_loop(aura::Env::GetInstance()->GetDispatcher()); |