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/focus/accelerator_handler_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/focus/accelerator_handler_win.cc')
| -rw-r--r-- | views/focus/accelerator_handler_win.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/views/focus/accelerator_handler_win.cc b/views/focus/accelerator_handler_win.cc index 496acd4..64b51f4 100644 --- a/views/focus/accelerator_handler_win.cc +++ b/views/focus/accelerator_handler_win.cc @@ -4,8 +4,7 @@ #include "views/focus/accelerator_handler.h" -#include "app/keyboard_code_conversion_win.h" -#include "app/keyboard_codes.h" +#include "base/keyboard_codes.h" #include "base/win_util.h" #include "views/event.h" #include "views/focus/focus_manager.h" @@ -26,7 +25,7 @@ bool AcceleratorHandler::Dispatch(const MSG& msg) { case WM_KEYDOWN: case WM_SYSKEYDOWN: { KeyEvent event(Event::ET_KEY_PRESSED, - app::KeyboardCodeForWindowsKeyCode(msg.wParam), + win_util::WinToKeyboardCode(msg.wParam), KeyEvent::GetKeyStateFlags(), msg.lParam & 0xFFFF, (msg.lParam & 0xFFFF0000) >> 16); |