| 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 3408d2f263d050caa71023446eed683ca2020561..f496dbea44b3ed9cee8971d5c4fec1156ad30bc6 100644
|
| --- a/ui/views/controls/menu/menu_controller.cc
|
| +++ b/ui/views/controls/menu/menu_controller.cc
|
| @@ -25,6 +25,7 @@
|
| #include "ui/views/widget/widget.h"
|
|
|
| #if defined(USE_AURA)
|
| +#include "ash/accelerators/accelerator_handler.h"
|
| #include "ui/aura/root_window.h"
|
| #elif defined(TOOLKIT_USES_GTK)
|
| #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
|
| @@ -318,7 +319,12 @@ MenuItemView* MenuController::Run(Widget* parent,
|
| MessageLoopForUI* loop = MessageLoopForUI::current();
|
| bool did_allow_task_nesting = loop->NestableTasksAllowed();
|
| loop->SetNestableTasksAllowed(true);
|
| +#if defined(USE_AURA)
|
| + ash::AcceleratorHandler handler(this);
|
| + loop->RunWithDispatcher(&handler);
|
| +#else
|
| loop->RunWithDispatcher(this);
|
| +#endif
|
| loop->SetNestableTasksAllowed(did_allow_task_nesting);
|
|
|
| if (ViewsDelegate::views_delegate)
|
|
|