Index: ui/views/corewm/window_modality_controller.cc |
diff --git a/ui/views/corewm/window_modality_controller.cc b/ui/views/corewm/window_modality_controller.cc |
index dd91a20bb8141574750ef9aaa9ba5f26b31c138e..c6b2a37b7b6d243c3bf1a8cb9497b23d305805c6 100644 |
--- a/ui/views/corewm/window_modality_controller.cc |
+++ b/ui/views/corewm/window_modality_controller.cc |
@@ -103,9 +103,10 @@ WindowModalityController::~WindowModalityController() { |
//////////////////////////////////////////////////////////////////////////////// |
// WindowModalityController, aura::EventFilter implementation: |
-ui::EventResult WindowModalityController::OnKeyEvent(ui::KeyEvent* event) { |
+void WindowModalityController::OnKeyEvent(ui::KeyEvent* event) { |
aura::Window* target = static_cast<aura::Window*>(event->target()); |
- return GetModalTransient(target) ? ui::ER_CONSUMED : ui::ER_UNHANDLED; |
+ if (GetModalTransient(target)) |
+ event->StopPropagation(); |
} |
ui::EventResult WindowModalityController::OnMouseEvent(ui::MouseEvent* event) { |