diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-21 22:44:55 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-21 22:44:55 +0000 |
| commit | 400e5ef7a8dd6d7e9c0008f8137361e58d629478 (patch) | |
| tree | a8171842cc2a10f1ff59dcac00b3f8eed0a42ede /base/keyboard_codes.h | |
| parent | 11d454b9313928237196cf056d567d8c6a5143e4 (diff) | |
| download | chromium_src-400e5ef7a8dd6d7e9c0008f8137361e58d629478.zip chromium_src-400e5ef7a8dd6d7e9c0008f8137361e58d629478.tar.gz chromium_src-400e5ef7a8dd6d7e9c0008f8137361e58d629478.tar.bz2 | |
Use windows keycodes under linux (and all non-windows platforms).
This fixes any place where we use a VKEY_* (RenderWidgetHost, for example)
under Linux, but breaks accelerators in TOOLKIT_VIEWS which relied on this
wrong behaviour.
Previously, keyboard_codes_linux defined all the VKEY_* constants as their
GDK_* counterparts, which is wrong since the VKEY_* are supposed to resolve
to windows key codes.
BUG=22551
Review URL: http://codereview.chromium.org/214040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26756 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/keyboard_codes.h')
| -rw-r--r-- | base/keyboard_codes.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/base/keyboard_codes.h b/base/keyboard_codes.h index 49add77..9a7f968 100644 --- a/base/keyboard_codes.h +++ b/base/keyboard_codes.h @@ -9,10 +9,8 @@ #if defined(OS_WIN) #include "base/keyboard_codes_win.h" -#elif defined(USE_X11) -#include "base/keyboard_codes_linux.h" -#elif defined(OS_MACOSX) -#include "base/keyboard_codes_mac.h" +#elif defined(USE_X11) || defined(OS_MACOSX) +#include "base/keyboard_codes_posix.h" #endif #endif // BASE_KEYBOARD_CODES_H_ |