diff options
| author | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-09 16:28:11 +0000 |
|---|---|---|
| committer | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-09 16:28:11 +0000 |
| commit | 052cc05d94f57a87d26db835511324eadd9c7276 (patch) | |
| tree | 31df70dc13edf9cddc844d02df48cec281dbee76 /ash/drag_drop | |
| parent | 5e9e7fb3fb2f3175f36c62df995eb6584f923d77 (diff) | |
| download | chromium_src-052cc05d94f57a87d26db835511324eadd9c7276.zip chromium_src-052cc05d94f57a87d26db835511324eadd9c7276.tar.gz chromium_src-052cc05d94f57a87d26db835511324eadd9c7276.tar.bz2 | |
Unified Gesture Recognizer
This adds the unified GR for Aura behind the --use-unified-gesture-detector flag.
BUG=332418
TEST=GestureRecognizer/GestureRecognizerTest.*
MotionEventUITest.*
Review URL: https://codereview.chromium.org/251543003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 9ef0b9b..e08d793 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -24,6 +24,7 @@ #include "ui/events/event.h" #include "ui/events/event_utils.h" #include "ui/events/gestures/gesture_types.h" +#include "ui/events/test/events_test_utils.h" #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/image/image_skia_rep.h" #include "ui/views/test/test_views_delegate.h" @@ -282,8 +283,12 @@ void DispatchGesture(ui::EventType gesture_type, gfx::Point location) { ui::EventTimeForNow(), ui::GestureEventDetails(gesture_type, 0, 0), 1); - Shell::GetPrimaryRootWindow()->GetHost()->dispatcher()->DispatchGestureEvent( - &gesture_event); + ui::EventSource* event_source = + Shell::GetPrimaryRootWindow()->GetHost()->GetEventSource(); + ui::EventSourceTestApi event_source_test(event_source); + ui::EventDispatchDetails details = + event_source_test.SendEventToProcessor(&gesture_event); + CHECK(!details.dispatcher_destroyed); } } // namespace |