Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Unified Diff: ui/aura/window_unittest.cc

Issue 10964051: events: Clean up dispatching code for touch-events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/test/test_window_delegate.cc ('k') | ui/base/events/event_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_unittest.cc
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 5c938195348773c64a9a6b2a0570efef8870a2e9..1330742c448879a23efbc3bb7e75d50cfc710095 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -171,9 +171,9 @@ class CaptureWindowDelegateImpl : public TestWindowDelegate {
mouse_event_count_++;
return ui::ER_UNHANDLED;
}
- virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
+ virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
touch_event_count_++;
- return ui::TOUCH_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
virtual ui::EventResult OnGestureEvent(
ui::GestureEvent* event) OVERRIDE {
« no previous file with comments | « ui/aura/test/test_window_delegate.cc ('k') | ui/base/events/event_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698