summaryrefslogtreecommitdiffstats
path: root/views/controls/menu
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-04 16:27:51 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-04 16:27:51 +0000
commitf557255f10d0a3630a0f2f668af7e64facd004b0 (patch)
tree41b2521588fa520ee42a286e4d32c5e107b38c7a /views/controls/menu
parenteb1efc4f57535df05e213b6f27be9b7246621722 (diff)
downloadchromium_src-f557255f10d0a3630a0f2f668af7e64facd004b0.zip
chromium_src-f557255f10d0a3630a0f2f668af7e64facd004b0.tar.gz
chromium_src-f557255f10d0a3630a0f2f668af7e64facd004b0.tar.bz2
Fixes bug that resulted in nested menus staying on screen if the
nested menu brought up a dialog. BUG=101881 TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/8447019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu')
-rw-r--r--views/controls/menu/menu_controller.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 5de3ab3..df24a63 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -355,6 +355,7 @@ MenuItemView* MenuController::Run(Widget* parent,
// another blocking loop. We need to make sure all menus are hidden
// before that happens otherwise the menus will stay on screen.
CloseAllNestedMenus();
+ SetSelection(NULL, SELECTION_UPDATE_IMMEDIATELY | SELECTION_EXIT);
// Set exit_all_, which makes sure all nested loops exit immediately.
if (exit_type_ != EXIT_DESTROYED)