| Index: ash/wm/window_manager_unittest.cc
|
| diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
|
| index 98568e4189b8a3d90593220f00642bf7cb00dde5..773a4a6e37ee0166bd1fdc0ae66877cb4ade4476 100644
|
| --- a/ash/wm/window_manager_unittest.cc
|
| +++ b/ash/wm/window_manager_unittest.cc
|
| @@ -54,9 +54,12 @@ class CustomEventHandler : public aura::test::TestEventHandler {
|
| }
|
|
|
| // Overridden from ui::EventHandler:
|
| - virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
|
| - ui::EventResult result = aura::test::TestEventHandler::OnKeyEvent(event);
|
| - return key_result_ == ui::ER_UNHANDLED ? result : key_result_;
|
| + virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
|
| + aura::test::TestEventHandler::OnKeyEvent(event);
|
| + if (key_result_ & ui::ER_HANDLED)
|
| + event->SetHandled();
|
| + if (key_result_ & ui::ER_CONSUMED)
|
| + event->StopPropagation();
|
| }
|
|
|
| virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
|
|
|