diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 00:33:35 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 00:33:35 +0000 |
| commit | bc1407f95bae3d7472ee0c85ef83ee10610b3f1f (patch) | |
| tree | eeb1e01423fefc13afe5738d809df200b5e50623 /views/controls/native_control.cc | |
| parent | 62525634a6f5727216828f8e05a4f563be90dfeb (diff) | |
| download | chromium_src-bc1407f95bae3d7472ee0c85ef83ee10610b3f1f.zip chromium_src-bc1407f95bae3d7472ee0c85ef83ee10610b3f1f.tar.gz chromium_src-bc1407f95bae3d7472ee0c85ef83ee10610b3f1f.tar.bz2 | |
Relanding keyboard code refactoring:
http://codereview.chromium.org/248010/show
Changing the KeyboardEvent to use a KeyboardCode instead of a w_char. Led to several places where I had to switch from VK_ to VKEY_.
Also cleaned-up the table view OnKeyDown method. Since TableView is a NativeControl it can use the NativeControl::OnKeyDown directly.
BUG=None
TEST=Make sure short-cuts works as expected, especially in the omnibox.
Review URL: http://codereview.chromium.org/251020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27444 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 0c89664..700da66 100644 --- a/views/controls/native_control.cc +++ b/views/controls/native_control.cc @@ -11,6 +11,7 @@ #include <atlmisc.h> #include "app/l10n_util_win.h" +#include "base/keyboard_codes.h" #include "base/logging.h" #include "base/win_util.h" #include "views/background.h" @@ -363,8 +364,8 @@ LRESULT CALLBACK NativeControl::NativeControlWndProc(HWND window, UINT message, DCHECK(native_control); if (message == WM_KEYDOWN && - native_control->OnKeyDown(static_cast<int>(w_param))) { - return 0; + native_control->OnKeyDown(win_util::WinToKeyboardCode(w_param))) { + return 0; } else if (message == WM_SETFOCUS) { // Let the focus manager know that the focus changed. FocusManager* focus_manager = native_control->GetFocusManager(); |