summaryrefslogtreecommitdiffstats
path: root/ash/drag_drop
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-21 13:31:45 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-21 13:31:45 +0000
commit64a5a8cb4268b15ea6ec734a00114ef30f9381fb (patch)
treeacf46e4070851d9be1ca5dfcd01d0ac0af557f71 /ash/drag_drop
parent676c561eae941ee83445be73fb9148859bfcdf64 (diff)
downloadchromium_src-64a5a8cb4268b15ea6ec734a00114ef30f9381fb.zip
chromium_src-64a5a8cb4268b15ea6ec734a00114ef30f9381fb.tar.gz
chromium_src-64a5a8cb4268b15ea6ec734a00114ef30f9381fb.tar.bz2
Gesture recognizer must be a singleton accross all aura::RootWindows
BUG=279317 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=229753 R=sadrul@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/25350006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
-rw-r--r--ash/drag_drop/drag_drop_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
index 48e7c35..d335465 100644
--- a/ash/drag_drop/drag_drop_controller.cc
+++ b/ash/drag_drop/drag_drop_controller.cc
@@ -181,7 +181,7 @@ int DragDropController::StartDragAndDrop(
// We need to transfer the current gesture sequence and the GR's touch event
// queue to the |drag_drop_tracker_|'s capture window so that when it takes
// capture, it still gets a valid gesture state.
- root_window->gesture_recognizer()->TransferEventsTo(source_window,
+ ui::GestureRecognizer::Get()->TransferEventsTo(source_window,
tracker->capture_window());
// We also send a gesture end to the source window so it can clear state.
// TODO(varunjain): Remove this whole block when gesture sequence