Index: ui/aura/root_window_unittest.cc |
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc |
index 7de3bf3ad53b7fb7be898abb4905b121c1e2dd49..98d3eb1ebcddbd678b3101794aaa12ebf731851b 100644 |
--- a/ui/aura/root_window_unittest.cc |
+++ b/ui/aura/root_window_unittest.cc |
@@ -459,9 +459,8 @@ class EventFilterRecorder : public ui::EventHandler { |
return ui::ER_UNHANDLED; |
} |
- virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE { |
+ virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { |
events_.push_back(event->type()); |
- return ui::ER_UNHANDLED; |
} |
private: |
@@ -746,16 +745,17 @@ class DetachesParentOnTapDelegate : public test::TestWindowDelegate { |
virtual ~DetachesParentOnTapDelegate() {} |
private: |
- virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE { |
- if (event->type() == ui::ET_GESTURE_TAP_DOWN) |
- return ui::ER_HANDLED; |
+ virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { |
+ if (event->type() == ui::ET_GESTURE_TAP_DOWN) { |
+ event->SetHandled(); |
+ return; |
+ } |
if (event->type() == ui::ET_GESTURE_TAP) { |
Window* parent = static_cast<Window*>(event->target())->parent(); |
parent->parent()->RemoveChild(parent); |
- return ui::ER_HANDLED; |
+ event->SetHandled(); |
} |
- return ui::ER_UNHANDLED; |
} |
DISALLOW_COPY_AND_ASSIGN(DetachesParentOnTapDelegate); |