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 ba7c4412a14a2efc55f24a9bc2faad2beec7a407..81159fefe2a4589a95ec91a3ebaaa463b00331bf 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->PreventDefault(); |
} |
// Overridden from aura::WindowObserver: |