Index: ui/views/corewm/focus_controller_unittest.cc |
diff --git a/ui/views/corewm/focus_controller_unittest.cc b/ui/views/corewm/focus_controller_unittest.cc |
index 6fb0751f3d94b23e702947e4ccf7cdbb84fda828..ee4b8346ec808adf62c17d2a1d7d36453f8eb17a 100644 |
--- a/ui/views/corewm/focus_controller_unittest.cc |
+++ b/ui/views/corewm/focus_controller_unittest.cc |
@@ -42,9 +42,12 @@ class FocusEventsTestHandler : public ui::EventHandler, |
private: |
// Overridden from ui::EventHandler: |
- virtual ui::EventResult OnEvent(ui::Event* event) OVERRIDE { |
+ virtual void OnEvent(ui::Event* event) OVERRIDE { |
event_counts_[event->type()] += 1; |
- return result_; |
+ if (result_ & ui::ER_CONSUMED) |
+ event->StopPropagation(); |
+ else if (result_ & ui::ER_HANDLED) |
+ event->SetHandled(); |
} |
// Overridden from aura::WindowObserver: |