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

Unified Diff: ui/aura/root_window_unittest.cc

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (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/root_window.cc ('k') | ui/aura/shared/compound_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window_unittest.cc
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index 00a1afe07a214c60656b5170d3064a8638d6b581..cd8e52c80f21bd460f5f19189abe9db1711059f9 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -108,9 +108,9 @@ class EventCountFilter : public EventFilter {
num_touch_events_++;
return ui::TOUCH_STATUS_UNKNOWN;
}
- virtual ui::GestureStatus PreHandleGestureEvent(
+ virtual ui::EventResult PreHandleGestureEvent(
Window* target, ui::GestureEvent* event) OVERRIDE {
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
private:
@@ -460,11 +460,11 @@ class EventFilterRecorder : public EventFilter {
events_.push_back(event->type());
return ui::TOUCH_STATUS_UNKNOWN;
}
- virtual ui::GestureStatus PreHandleGestureEvent(
+ virtual ui::EventResult PreHandleGestureEvent(
Window* target,
ui::GestureEvent* event) OVERRIDE {
events_.push_back(event->type());
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
private:
« no previous file with comments | « ui/aura/root_window.cc ('k') | ui/aura/shared/compound_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698