diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/views/accelerator_table_gtk.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/views/accelerator_table_gtk.cc')
| -rw-r--r-- | chrome/browser/views/accelerator_table_gtk.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/views/accelerator_table_gtk.cc b/chrome/browser/views/accelerator_table_gtk.cc index 3baa65e..261420e 100644 --- a/chrome/browser/views/accelerator_table_gtk.cc +++ b/chrome/browser/views/accelerator_table_gtk.cc @@ -6,14 +6,14 @@ #include "app/keyboard_codes.h" #include "base/basictypes.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" namespace browser { // NOTE: Keep this list in the same (mostly-alphabetical) order as // the Windows accelerators in ../../app/chrome_dll.rc. const AcceleratorMapping kAcceleratorMap[] = { - // Keycode Shift Ctrl Alt Command ID + // Keycode Shift Ctrl Alt Command ID { app::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT }, { app::VKEY_LEFT, false, false, true, IDC_BACK }, { app::VKEY_BACK, false, false, false, IDC_BACK }, @@ -81,6 +81,10 @@ const AcceleratorMapping kAcceleratorMap[] = { #if !defined(OS_CHROMEOS) { app::VKEY_F1, false, false, false, IDC_HELP_PAGE }, #endif +#if defined(OS_CHROMEOS) + { app::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE }, + { app::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE }, +#endif { app::VKEY_I, true, true, false, IDC_DEV_TOOLS }, { app::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE }, { app::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT }, |