diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 19:09:06 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 19:09:06 +0000 |
| commit | 92258389a1a4190987f3b4a64386fd9eb0f126ea (patch) | |
| tree | 567ea0779660a7f822289f3c945721f2e9d6fad1 /views/window/window_win.cc | |
| parent | 47fa280c2ff011bb948a9978687418079731a854 (diff) | |
| download | chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.zip chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.gz chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58215 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, 1 insertions, 2 deletions
diff --git a/views/window/window_win.cc b/views/window/window_win.cc index 6aa5224..af03463 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -7,7 +7,6 @@ #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" @@ -1121,7 +1120,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(app::KeyboardCodeForWindowsKeyCode(VK_MENU), + Accelerator accelerator(win_util::WinToKeyboardCode(VK_MENU), false, false, false); GetFocusManager()->ProcessAccelerator(accelerator); return; |