diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 20:58:55 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 20:58:55 +0000 |
| commit | dc089546b026a132d41388ef37181e7e765468e7 (patch) | |
| tree | 22c14176b89dc3ec23dd20b2727ebde77e5ea587 /views | |
| parent | 940e3da594589ef7be1ceb8ea98c174b12c80b5d (diff) | |
| download | chromium_src-dc089546b026a132d41388ef37181e7e765468e7.zip chromium_src-dc089546b026a132d41388ef37181e7e765468e7.tar.gz chromium_src-dc089546b026a132d41388ef37181e7e765468e7.tar.bz2 | |
Changes menu button to not show the menu on alt-space. alt-space
should show the window menu, so that if menu button consumes this
event the window menu is never shown.
BUG=56650
TEST=press alt and release, focus should be on the wrench. press
alt-space, make sure the window menu appears, not the wrench menu.
R=ben@chromium.org
Review URL: http://codereview.chromium.org/7315002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/button/menu_button.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 89ab71a..d2aa09e 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -221,6 +221,9 @@ void MenuButton::OnMouseExited(const MouseEvent& event) { bool MenuButton::OnKeyPressed(const KeyEvent& event) { switch (event.key_code()) { case ui::VKEY_SPACE: + // Alt-space on windows should show the window menu. + if (event.IsAltDown()) + break; case ui::VKEY_RETURN: case ui::VKEY_UP: case ui::VKEY_DOWN: { |