diff options
| -rw-r--r-- | chrome/app/chrome_dll.rc | 4 | ||||
| -rw-r--r-- | chrome/browser/views/accelerator_table_gtk.cc | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index 4c95af0..f50fb6c 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -46,12 +46,12 @@ BEGIN VK_F3, IDC_FIND_NEXT, VIRTKEY "G", IDC_FIND_PREVIOUS, VIRTKEY, CONTROL, SHIFT VK_F3, IDC_FIND_PREVIOUS, VIRTKEY, SHIFT - VK_F6, IDC_FOCUS_NEXT_PANE, VIRTKEY - VK_F6, IDC_FOCUS_PREVIOUS_PANE, VIRTKEY, SHIFT "D", IDC_FOCUS_LOCATION, VIRTKEY, ALT "L", IDC_FOCUS_LOCATION, VIRTKEY, CONTROL VK_F10, IDC_FOCUS_MENU_BAR, VIRTKEY VK_MENU, IDC_FOCUS_MENU_BAR, VIRTKEY + VK_F6, IDC_FOCUS_NEXT_PANE, VIRTKEY + VK_F6, IDC_FOCUS_PREVIOUS_PANE, VIRTKEY, SHIFT "K", IDC_FOCUS_SEARCH, VIRTKEY, CONTROL "E", IDC_FOCUS_SEARCH, VIRTKEY, CONTROL "T", IDC_FOCUS_TOOLBAR, VIRTKEY, SHIFT, ALT diff --git a/chrome/browser/views/accelerator_table_gtk.cc b/chrome/browser/views/accelerator_table_gtk.cc index a6450c6..1841ac6 100644 --- a/chrome/browser/views/accelerator_table_gtk.cc +++ b/chrome/browser/views/accelerator_table_gtk.cc @@ -44,16 +44,24 @@ const AcceleratorMapping kAcceleratorMap[] = { #if defined(OS_CHROMEOS) { base::VKEY_S, true, false, true, IDC_FOCUS_CHROMEOS_STATUS }, #endif -#if !defined(OS_CHROMEOS) - { base::VKEY_F6, false, false, false, IDC_FOCUS_NEXT_PANE }, - { base::VKEY_F6, true, false, false, IDC_FOCUS_PREVIOUS_PANE }, -#endif { base::VKEY_D, false, false, true, IDC_FOCUS_LOCATION }, { base::VKEY_L, false, true, false, IDC_FOCUS_LOCATION }, #if !defined(OS_CHROMEOS) { base::VKEY_F10, false, false, false, IDC_FOCUS_MENU_BAR }, #endif { base::VKEY_MENU, false, false, false, IDC_FOCUS_MENU_BAR }, +#if !defined(OS_CHROMEOS) + { base::VKEY_F6, false, false, false, IDC_FOCUS_NEXT_PANE }, +#endif +#if defined(OS_CHROMEOS) + { base::VKEY_F2, false, true, false, IDC_FOCUS_NEXT_PANE }, +#endif +#if !defined(OS_CHROMEOS) + { base::VKEY_F6, true, false, false, IDC_FOCUS_PREVIOUS_PANE }, +#endif +#if defined(OS_CHROMEOS) + { base::VKEY_F1, false, true, false, IDC_FOCUS_PREVIOUS_PANE }, +#endif { base::VKEY_K, false, true, false, IDC_FOCUS_SEARCH }, { base::VKEY_E, false, true, false, IDC_FOCUS_SEARCH }, { base::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH }, |