diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 16:39:26 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 16:39:26 +0000 |
| commit | 1eed61535cb6e15015edac43177ccdc25140855a (patch) | |
| tree | 843a3c3b42bfaadc54cd6c835e4c313965a0e177 /views/controls/native_control.cc | |
| parent | de6aadf4ddf69c76ddd60e03451fdbcb4061283f (diff) | |
| download | chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.zip chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.tar.gz chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/native_control.cc')
| -rw-r--r-- | views/controls/native_control.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc index 942a093..a0ff1b0 100644 --- a/views/controls/native_control.cc +++ b/views/controls/native_control.cc @@ -10,8 +10,9 @@ #include <atlframe.h> #include <atlmisc.h> +#include "app/keyboard_code_conversion_win.h" +#include "app/keyboard_codes.h" #include "app/l10n_util_win.h" -#include "base/keyboard_codes.h" #include "base/logging.h" #include "base/win_util.h" #include "gfx/native_theme_win.h" @@ -359,7 +360,7 @@ LRESULT CALLBACK NativeControl::NativeControlWndProc(HWND window, UINT message, DCHECK(native_control); if (message == WM_KEYDOWN && - native_control->OnKeyDown(win_util::WinToKeyboardCode(w_param))) { + native_control->OnKeyDown(app::KeyboardCodeForWindowsKeyCode(w_param))) { return 0; } else if (message == WM_SETFOCUS) { // Let the focus manager know that the focus changed. |