Chromium Code Reviews| Index: ui/views/controls/menu/menu_controller.cc |
| diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc |
| index f0c1cc1f04b8528ced9ef4f6b32ba6b99b846c81..9f6fa564f1bacdc7bb03a37eb70ac363f4e25b3c 100644 |
| --- a/ui/views/controls/menu/menu_controller.cc |
| +++ b/ui/views/controls/menu/menu_controller.cc |
| @@ -889,13 +889,17 @@ base::MessagePumpDispatcher::DispatchStatus |
| } |
| switch (ui::EventTypeFromNative(xev)) { |
| case ui::ET_KEY_PRESSED: |
| - OnKeyDown(ui::KeyboardCodeFromNative(xev)); |
| + if (!OnKeyDown(ui::KeyboardCodeFromNative(xev))) |
| + return base::MessagePumpDispatcher::EVENT_QUIT; |
| + |
| // OnKeyDown may have set exit_type_. |
| if (exit_type_ != EXIT_NONE) |
|
sky
2011/12/16 17:22:16
This shouldn't be needed anymore.
jennyz
2011/12/16 17:29:30
Done.
|
| return base::MessagePumpDispatcher::EVENT_QUIT; |
| // TODO(oshima): support SelectChar |
| - break; |
| + // See http://crbug.com/107869 |
| + |
| + return base::MessagePumpDispatcher::EVENT_PROCESSED; |
| case ui::ET_KEY_RELEASED: |
| return base::MessagePumpDispatcher::EVENT_PROCESSED; |
| default: |