| 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 00eca7a56cbf7dd902273ef18536b20196e5c939..de6444dcfb3337b62bea2ebc22b236ebdf0ff909 100644
|
| --- a/ui/base/events/event_dispatcher_unittest.cc
|
| +++ b/ui/base/events/event_dispatcher_unittest.cc
|
| @@ -100,9 +100,12 @@ class TestEventHandler : public EventHandler {
|
| return event_result_;
|
| }
|
|
|
| - virtual EventResult OnGestureEvent(GestureEvent* event) OVERRIDE {
|
| + virtual void OnGestureEvent(GestureEvent* event) OVERRIDE {
|
| ReceivedEvent(event);
|
| - return event_result_;
|
| + if (event_result_ & ui::ER_CONSUMED)
|
| + event->StopPropagation();
|
| + if (event_result_ & ui::ER_HANDLED)
|
| + event->SetHandled();
|
| }
|
|
|
| int id_;
|
|
|