| 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 23c2e1bc81e58b46ce0e6a7045d654181d3e07d6..886e7d2c9c92d079876d32d5367b07ce94b1888d 100644
|
| --- a/ui/views/controls/menu/menu_controller.cc
|
| +++ b/ui/views/controls/menu/menu_controller.cc
|
| @@ -1194,7 +1194,9 @@ void MenuController::StartDrag(SubmenuView* source,
|
| }
|
|
|
| void MenuController::OnKeyDown(ui::KeyboardCode key_code) {
|
| - DCHECK(blocking_run_);
|
| + // Do not process while performing drag-and-drop
|
| + if (!blocking_run_)
|
| + return;
|
|
|
| switch (key_code) {
|
| case ui::VKEY_UP:
|
| @@ -2263,6 +2265,9 @@ void MenuController::AcceptOrSelect(MenuItemView* parent,
|
| }
|
|
|
| void MenuController::SelectByChar(base::char16 character) {
|
| + // Do not process while performing drag-and-drop
|
| + if (!blocking_run_)
|
| + return;
|
| if (!character)
|
| return;
|
|
|
|
|