| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/views/accelerator_table_gtk.h" | 5 #include "chrome/browser/views/accelerator_table_gtk.h" |
| 6 | 6 |
| 7 #include "app/keyboard_codes.h" | 7 #include "app/keyboard_codes.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 | 10 |
| 11 namespace browser { | 11 namespace browser { |
| 12 | 12 |
| 13 // NOTE: Keep this list in the same (mostly-alphabetical) order as | 13 // NOTE: Keep this list in the same (mostly-alphabetical) order as |
| 14 // the Windows accelerators in ../../app/chrome_dll.rc. | 14 // the Windows accelerators in ../../app/chrome_dll.rc. |
| 15 const AcceleratorMapping kAcceleratorMap[] = { | 15 const AcceleratorMapping kAcceleratorMap[] = { |
| 16 // Keycode Shift Ctrl Alt Command ID | 16 // Keycode Shift Ctrl Alt Command ID |
| 17 { app::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT }, | 17 { app::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT }, |
| 18 { app::VKEY_LEFT, false, false, true, IDC_BACK }, | 18 { app::VKEY_LEFT, false, false, true, IDC_BACK }, |
| 19 { app::VKEY_BACK, false, false, false, IDC_BACK }, | 19 { app::VKEY_BACK, false, false, false, IDC_BACK }, |
| 20 #if defined(OS_CHROMEOS) | 20 #if defined(OS_CHROMEOS) |
| 21 { app::VKEY_F1, false, false, false, IDC_BACK }, | 21 { app::VKEY_F1, false, false, false, IDC_BACK }, |
| 22 // TODO(mazda): Change VKEY_1 to VKEY_OME_2 once the new version of the |
| 23 // keyboard overlay is ready. |
| 24 { app::VKEY_1, false, true, true, IDC_SHOW_KEYBOARD_OVERLAY }, |
| 22 #endif | 25 #endif |
| 23 { app::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE }, | 26 { app::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE }, |
| 24 { app::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS }, | 27 { app::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS }, |
| 25 { app::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA }, | 28 { app::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA }, |
| 26 #if !defined(OS_CHROMEOS) | 29 #if !defined(OS_CHROMEOS) |
| 27 { app::VKEY_F4, false, true, false, IDC_CLOSE_TAB }, | 30 { app::VKEY_F4, false, true, false, IDC_CLOSE_TAB }, |
| 28 #endif | 31 #endif |
| 29 { app::VKEY_W, false, true, false, IDC_CLOSE_TAB }, | 32 { app::VKEY_W, false, true, false, IDC_CLOSE_TAB }, |
| 30 { app::VKEY_W, true, true, false, IDC_CLOSE_WINDOW }, | 33 { app::VKEY_W, true, true, false, IDC_CLOSE_WINDOW }, |
| 31 #if !defined(OS_CHROMEOS) | 34 #if !defined(OS_CHROMEOS) |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 { app::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, | 153 { app::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, |
| 151 { app::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, | 154 { app::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, |
| 152 { app::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, | 155 { app::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, |
| 153 { app::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, | 156 { app::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, |
| 154 { app::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, | 157 { app::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, |
| 155 }; | 158 }; |
| 156 | 159 |
| 157 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); | 160 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); |
| 158 | 161 |
| 159 } // namespace browser | 162 } // namespace browser |
| OLD | NEW |