diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 08:53:46 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 08:53:46 +0000 |
| commit | 45acbc45bc96fd5675409e3dd6dc0c7315f03b39 (patch) | |
| tree | f562e428f40a1013cc2a0a55e4bd4c8c36c3ce5f /ash/drag_drop | |
| parent | 979a73f19ca474ef563965131e56396028afc647 (diff) | |
| download | chromium_src-45acbc45bc96fd5675409e3dd6dc0c7315f03b39.zip chromium_src-45acbc45bc96fd5675409e3dd6dc0c7315f03b39.tar.gz chromium_src-45acbc45bc96fd5675409e3dd6dc0c7315f03b39.tar.bz2 | |
Revert r229753 "Gesture recognizer must be a singleton accross all aura::RootWindows"
Breaks windows bots on chromium.webkit.
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder/builds/44634
TBR=varunjain
Review URL: https://codereview.chromium.org/30813003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 2 |
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 d335465..48e7c35 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. - ui::GestureRecognizer::Get()->TransferEventsTo(source_window, + root_window->gesture_recognizer()->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 |