Index: ash/wm/window_manager_unittest.cc |
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc |
index 773a4a6e37ee0166bd1fdc0ae66877cb4ade4476..2328850c6b9964298e67a55604762c9a74c95a2c 100644 |
--- a/ash/wm/window_manager_unittest.cc |
+++ b/ash/wm/window_manager_unittest.cc |
@@ -62,9 +62,12 @@ class CustomEventHandler : public aura::test::TestEventHandler { |
event->StopPropagation(); |
} |
- virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE { |
- ui::EventResult result = aura::test::TestEventHandler::OnMouseEvent(event); |
- return mouse_result_ == ui::ER_UNHANDLED ? result : mouse_result_; |
+ virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { |
+ aura::test::TestEventHandler::OnMouseEvent(event); |
+ if (mouse_result_ & ui::ER_HANDLED) |
+ event->SetHandled(); |
+ if (mouse_result_ & ui::ER_CONSUMED) |
+ event->StopPropagation(); |
} |
private: |