[Relanding erg's change with fix for toolkit_views shortcuts and
interactive ui tests. Note that this was originally reviewed in
http://codereview.chromium.org/217022/show I originally Elliot
suggestion of replacing the usage of int for keycode with the
bae::Keycode type, but that led to the CL getting out of hands
(as this is used in many different places). So this is only the
patch set 1 of that CL, I'll replace the type in another CL]
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
TEST=Make sure accelerators still work as expected on Chrome Linux and
Chrome Linux with toolkit views. Test when the the accelerators with
the focus in the location bar and also with the focus on the page.
Review URL: http://codereview.chromium.org/235025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27284 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: c566c610480e0d8e915193c058f415a7660d48b5
diff --git a/base/base.gyp b/base/base.gyp
index 0619789..bca5794 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -157,8 +157,11 @@
'json_reader.h',
'json_writer.cc',
'json_writer.h',
+ 'keyboard_code_conversion_gtk.cc',
+ 'keyboard_code_conversion_gtk.h',
'keyboard_codes.h',
'keyboard_codes_win.h',
+ 'keyboard_codes_posix.h',
'lazy_instance.cc',
'lazy_instance.h',
'leak_tracker.h',
@@ -459,7 +462,7 @@
},
],
[ 'OS == "mac"', {
- 'sources/': [ ['exclude', '_(linux|win|chromeos)\\.cc$'] ],
+ 'sources/': [ ['exclude', '_(linux|gtk|win|chromeos)\\.cc$'] ],
'sources!': [
],
'link_settings': {
@@ -483,7 +486,7 @@
'include_dirs': [
'../chrome/third_party/wtl/include',
],
- 'sources/': [ ['exclude', '_(linux|mac|posix|chromeos)\\.cc$'],
+ 'sources/': [ ['exclude', '_(linux|gtk|mac|posix|chromeos)\\.cc$'],
['exclude', '\\.mm?$' ] ],
'sources': [
'window_impl.cc',