| 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 030600f84cc8b37673ff65c744c67c5c68e11f35..02a5b62841fec89da5920a4ec418d95abb751d8b 100644
|
| --- a/ui/views/controls/menu/menu_controller.cc
|
| +++ b/ui/views/controls/menu/menu_controller.cc
|
| @@ -1023,18 +1023,17 @@ void MenuController::OnDragComplete(bool should_close) {
|
| }
|
|
|
| ui::PostDispatchAction MenuController::OnWillDispatchKeyEvent(
|
| - base::char16 character,
|
| - ui::KeyboardCode key_code) {
|
| + const ui::KeyEvent& key_event) {
|
| if (exit_type() == MenuController::EXIT_ALL ||
|
| exit_type() == MenuController::EXIT_DESTROYED) {
|
| TerminateNestedMessageLoopIfNecessary();
|
| return ui::POST_DISPATCH_PERFORM_DEFAULT;
|
| }
|
|
|
| - if (character)
|
| - SelectByChar(character);
|
| + if (key_event.is_char())
|
| + SelectByChar(key_event.GetCharacter());
|
| else
|
| - OnKeyDown(key_code);
|
| + OnKeyDown(key_event.key_code());
|
|
|
| // MenuController may have been deleted, so check for an active instance
|
| // before accessing member variables.
|
|
|