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) |