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 19936f31bcfc12d601386c30ab64b1a583e4fd00..f6866fbfee672c018fff79090b25e643f304abd0 100644 |
--- a/ui/views/controls/menu/menu_controller.cc |
+++ b/ui/views/controls/menu/menu_controller.cc |
@@ -1038,7 +1038,11 @@ bool MenuController::OnKeyDown(ui::KeyboardCode key_code) { |
case ui::VKEY_RETURN: |
if (pending_state_.item) { |
if (pending_state_.item->HasSubmenu()) { |
- OpenSubmenuChangeSelectionIfCan(); |
+ if (key_code == ui::VKEY_F4 && |
+ pending_state_.item->GetSubmenu()->IsShowing()) |
sky
2014/08/20 02:45:39
Why does it matter whether the submenu is showing?
Deepak
2014/08/20 03:37:33
As When Submneu is shown, and we select F4, we wan
sky
2014/08/20 15:21:39
Comboboxs don't have submenus, right?
|
+ return false; |
+ else |
+ OpenSubmenuChangeSelectionIfCan(); |
} else { |
SendAcceleratorResultType result = SendAcceleratorToHotTrackedView(); |
if (result == ACCELERATOR_NOT_PROCESSED && |