diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:22:15 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:22:15 +0000 |
| commit | 2b7c9492e9a8794e2124da62bfce91fe3a1b2a77 (patch) | |
| tree | f13a5c7961e2655f63916216223d16fa86454a3d /views/window/window_win.cc | |
| parent | 010e37516995713253daa8df6f7ba1c2b12ccd1d (diff) | |
| download | chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.zip chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.tar.gz chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.tar.bz2 | |
Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.
Also moves the associated classes/enums from base:: to app::.
TEST=try bots compile
BUG=NONE
Review URL: http://codereview.chromium.org/3165064
TBR=bryeung@chromium.org
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3361003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window/window_win.cc')
| -rw-r--r-- | views/window/window_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/window/window_win.cc b/views/window/window_win.cc index af03463..6aa5224 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -7,6 +7,7 @@ #include <dwmapi.h> #include <shellapi.h> +#include "app/keyboard_code_conversion_win.h" #include "app/theme_provider.h" #include "app/win_util.h" #include "base/i18n/rtl.h" @@ -1120,7 +1121,7 @@ void WindowWin::OnSysCommand(UINT notification_code, CPoint click) { // Handle SC_KEYMENU, which means that the user has pressed the ALT // key and released it, so we should focus the menu bar. if ((notification_code & sc_mask) == SC_KEYMENU && click.x == 0) { - Accelerator accelerator(win_util::WinToKeyboardCode(VK_MENU), + Accelerator accelerator(app::KeyboardCodeForWindowsKeyCode(VK_MENU), false, false, false); GetFocusManager()->ProcessAccelerator(accelerator); return; |