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

Unified Diff: ui/base/events/event_dispatcher_unittest.cc

Issue 11568006: events: Update scroll and touch handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self-nit Created 8 years 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/window_unittest.cc ('k') | ui/base/events/event_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/events/event_dispatcher_unittest.cc
diff --git a/ui/base/events/event_dispatcher_unittest.cc b/ui/base/events/event_dispatcher_unittest.cc
index bf5889145c709563545e0284d26848d5a8cb9812..1cc8ba67fc23475100c5679d4a2187ce690c03f4 100644
--- a/ui/base/events/event_dispatcher_unittest.cc
+++ b/ui/base/events/event_dispatcher_unittest.cc
@@ -90,18 +90,22 @@ class TestEventHandler : public EventHandler {
return event_result_;
}
- virtual EventResult OnScrollEvent(ScrollEvent* event) OVERRIDE {
+ virtual void OnScrollEvent(ScrollEvent* event) OVERRIDE {
ReceivedEvent(event);
- return event_result_;
+ SetStatusOnEvent(event);
}
- virtual EventResult OnTouchEvent(TouchEvent* event) OVERRIDE {
+ virtual void OnTouchEvent(TouchEvent* event) OVERRIDE {
ReceivedEvent(event);
- return event_result_;
+ SetStatusOnEvent(event);
}
virtual void OnGestureEvent(GestureEvent* event) OVERRIDE {
ReceivedEvent(event);
+ SetStatusOnEvent(event);
+ }
+
+ void SetStatusOnEvent(Event* event) {
if (event_result_ & ui::ER_CONSUMED)
event->StopPropagation();
if (event_result_ & ui::ER_HANDLED)
« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/base/events/event_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698