| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/views/accelerator_table.h" | 5 #include "chrome/browser/ui/views/accelerator_table.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "ui/base/accelerators/accelerator.h" | 9 #include "ui/base/accelerators/accelerator.h" |
| 10 #include "ui/events/event_constants.h" | 10 #include "ui/events/event_constants.h" |
| 11 | 11 |
| 12 #if defined(USE_ASH) | 12 #if defined(USE_ASH) |
| 13 #include "ash/accelerators/accelerator_table.h" | 13 #include "ash/accelerators/accelerator_table.h" |
| 14 #endif | 14 #endif |
| 15 | 15 |
| 16 namespace chrome { | 16 namespace chrome { |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 // NOTE: Keep this list in the same (mostly-alphabetical) order as | 19 // NOTE: Keep this list in the same (mostly-alphabetical) order as |
| 20 // the Windows accelerators in ../../app/chrome_dll.rc. | 20 // the Windows accelerators in ../../app/chrome_dll.rc. |
| 21 // Do not use Ctrl-Alt as a shortcut modifier, as it is used by i18n keyboards: | 21 // Do not use Ctrl-Alt as a shortcut modifier, as it is used by i18n keyboards: |
| 22 // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/29/101121.aspx | 22 // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/29/101121.aspx |
| 23 const AcceleratorMapping kAcceleratorMap[] = { | 23 const AcceleratorMapping kAcceleratorMap[] = { |
| 24 { ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK }, | 24 {ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK}, |
| 25 { ui::VKEY_BACK, ui::EF_NONE, IDC_BACK }, | 25 {ui::VKEY_BACK, ui::EF_NONE, IDC_BACK}, |
| 26 { ui::VKEY_D, ui::EF_CONTROL_DOWN, IDC_BOOKMARK_PAGE }, | 26 {ui::VKEY_D, ui::EF_CONTROL_DOWN, IDC_BOOKMARK_PAGE}, |
| 27 { ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 27 {ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 28 IDC_BOOKMARK_ALL_TABS }, | 28 IDC_BOOKMARK_ALL_TABS}, |
| 29 { ui::VKEY_W, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, | 29 {ui::VKEY_W, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB}, |
| 30 { ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW }, | 30 {ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW}, |
| 31 { ui::VKEY_F, ui::EF_CONTROL_DOWN, IDC_FIND }, | 31 {ui::VKEY_F, ui::EF_CONTROL_DOWN, IDC_FIND}, |
| 32 { ui::VKEY_G, ui::EF_CONTROL_DOWN, IDC_FIND_NEXT }, | 32 {ui::VKEY_G, ui::EF_CONTROL_DOWN, IDC_FIND_NEXT}, |
| 33 { ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_FIND_PREVIOUS }, | 33 {ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_FIND_PREVIOUS}, |
| 34 { ui::VKEY_D, ui::EF_ALT_DOWN, IDC_FOCUS_LOCATION }, | 34 {ui::VKEY_D, ui::EF_ALT_DOWN, IDC_FOCUS_LOCATION}, |
| 35 { ui::VKEY_L, ui::EF_CONTROL_DOWN, IDC_FOCUS_LOCATION }, | 35 {ui::VKEY_L, ui::EF_CONTROL_DOWN, IDC_FOCUS_LOCATION}, |
| 36 { ui::VKEY_K, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH }, | 36 {ui::VKEY_K, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH}, |
| 37 { ui::VKEY_E, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH }, | 37 {ui::VKEY_E, ui::EF_CONTROL_DOWN, IDC_FOCUS_SEARCH}, |
| 38 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_TOOLBAR }, | 38 {ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_TOOLBAR}, |
| 39 { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_BOOKMARKS }, | 39 {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_BOOKMARKS}, |
| 40 { ui::VKEY_A, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_INFOBARS }, | 40 {ui::VKEY_A, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FOCUS_INFOBARS}, |
| 41 { ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD }, | 41 {ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD}, |
| 42 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN, IDC_FORWARD }, | 42 {ui::VKEY_BACK, ui::EF_SHIFT_DOWN, IDC_FORWARD}, |
| 43 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS }, | 43 {ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS}, |
| 44 { ui::VKEY_F12, ui::EF_NONE, IDC_DEV_TOOLS_TOGGLE }, | 44 {ui::VKEY_F12, ui::EF_NONE, IDC_DEV_TOOLS_TOGGLE}, |
| 45 { ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 45 {ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 46 IDC_DEV_TOOLS_CONSOLE }, | 46 IDC_DEV_TOOLS_CONSOLE}, |
| 47 { ui::VKEY_C, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 47 {ui::VKEY_C, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 48 IDC_DEV_TOOLS_INSPECT }, | 48 IDC_DEV_TOOLS_INSPECT}, |
| 49 { ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE }, | 49 {ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE}, |
| 50 { ui::VKEY_P, ui::EF_CONTROL_DOWN, IDC_PRINT}, | 50 {ui::VKEY_P, ui::EF_CONTROL_DOWN, IDC_PRINT}, |
| 51 { ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ADVANCED_PRINT}, | 51 #if !defined(OS_WIN) |
| 52 { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD }, | 52 {ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ADVANCED_PRINT}, |
| 53 { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 53 #endif // OS_WIN |
| 54 IDC_RELOAD_IGNORING_CACHE }, | 54 {ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD}, |
| 55 { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME }, | 55 {ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 56 { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE }, | 56 IDC_RELOAD_IGNORING_CACHE}, |
| 57 { ui::VKEY_9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB }, | 57 {ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME}, |
| 58 { ui::VKEY_NUMPAD9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB }, | 58 {ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE}, |
| 59 {ui::VKEY_9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB}, |
| 60 {ui::VKEY_NUMPAD9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB}, |
| 59 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 61 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 60 { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, | 62 {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, |
| 61 { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, | 63 {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, |
| 62 { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT }, | 64 {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, |
| 63 { ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, | 65 {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, |
| 64 IDC_MOVE_TAB_PREVIOUS }, | 66 IDC_MOVE_TAB_PREVIOUS}, |
| 65 #endif | 67 #endif |
| 66 { ui::VKEY_TAB, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, | 68 {ui::VKEY_TAB, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB}, |
| 67 { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, | 69 {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB}, |
| 68 { ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 70 {ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 69 IDC_SELECT_PREVIOUS_TAB }, | 71 IDC_SELECT_PREVIOUS_TAB}, |
| 70 { ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN, IDC_SELECT_PREVIOUS_TAB }, | 72 {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN, IDC_SELECT_PREVIOUS_TAB}, |
| 71 { ui::VKEY_1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0 }, | 73 {ui::VKEY_1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0}, |
| 72 { ui::VKEY_NUMPAD1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0 }, | 74 {ui::VKEY_NUMPAD1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0}, |
| 73 { ui::VKEY_2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1 }, | 75 {ui::VKEY_2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1}, |
| 74 { ui::VKEY_NUMPAD2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1 }, | 76 {ui::VKEY_NUMPAD2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1}, |
| 75 { ui::VKEY_3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2 }, | 77 {ui::VKEY_3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2}, |
| 76 { ui::VKEY_NUMPAD3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2 }, | 78 {ui::VKEY_NUMPAD3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2}, |
| 77 { ui::VKEY_4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3 }, | 79 {ui::VKEY_4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3}, |
| 78 { ui::VKEY_NUMPAD4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3 }, | 80 {ui::VKEY_NUMPAD4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3}, |
| 79 { ui::VKEY_5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4 }, | 81 {ui::VKEY_5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4}, |
| 80 { ui::VKEY_NUMPAD5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4 }, | 82 {ui::VKEY_NUMPAD5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4}, |
| 81 { ui::VKEY_6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5 }, | 83 {ui::VKEY_6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5}, |
| 82 { ui::VKEY_NUMPAD6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5 }, | 84 {ui::VKEY_NUMPAD6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5}, |
| 83 { ui::VKEY_7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6 }, | 85 {ui::VKEY_7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6}, |
| 84 { ui::VKEY_NUMPAD7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6 }, | 86 {ui::VKEY_NUMPAD7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6}, |
| 85 { ui::VKEY_8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7 }, | 87 {ui::VKEY_8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7}, |
| 86 { ui::VKEY_NUMPAD8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7 }, | 88 {ui::VKEY_NUMPAD8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7}, |
| 87 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 89 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 88 { ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 }, | 90 {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, |
| 89 { ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 }, | 91 {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, |
| 90 { ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 }, | 92 {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, |
| 91 { ui::VKEY_NUMPAD2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 }, | 93 {ui::VKEY_NUMPAD2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, |
| 92 { ui::VKEY_3, ui::EF_ALT_DOWN, IDC_SELECT_TAB_2 }, | 94 {ui::VKEY_3, ui::EF_ALT_DOWN, IDC_SELECT_TAB_2}, |
| 93 { ui::VKEY_NUMPAD3, ui::EF_ALT_DOWN, IDC_SELECT_TAB_2 }, | 95 {ui::VKEY_NUMPAD3, ui::EF_ALT_DOWN, IDC_SELECT_TAB_2}, |
| 94 { ui::VKEY_4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3 }, | 96 {ui::VKEY_4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3}, |
| 95 { ui::VKEY_NUMPAD4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3 }, | 97 {ui::VKEY_NUMPAD4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3}, |
| 96 { ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, | 98 {ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4}, |
| 97 { ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 }, | 99 {ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4}, |
| 98 { ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, | 100 {ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5}, |
| 99 { ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 }, | 101 {ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5}, |
| 100 { ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, | 102 {ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6}, |
| 101 { ui::VKEY_NUMPAD7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 }, | 103 {ui::VKEY_NUMPAD7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6}, |
| 102 { ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, | 104 {ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, |
| 103 { ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 }, | 105 {ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, |
| 104 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR }, | 106 {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR}, |
| 105 #endif | 107 #endif |
| 106 { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 108 {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 107 IDC_SHOW_BOOKMARK_BAR }, | 109 IDC_SHOW_BOOKMARK_BAR}, |
| 108 { ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 110 {ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 109 IDC_SHOW_BOOKMARK_MANAGER }, | 111 IDC_SHOW_BOOKMARK_MANAGER}, |
| 110 { ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS }, | 112 {ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS}, |
| 111 { ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY }, | 113 {ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY}, |
| 112 { ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, | 114 {ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, |
| 113 { ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, | 115 {ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, |
| 114 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, | 116 {ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP}, |
| 115 { ui::VKEY_OEM_PERIOD, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 117 {ui::VKEY_OEM_PERIOD, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 116 IDC_TOGGLE_SPEECH_INPUT }, | 118 IDC_TOGGLE_SPEECH_INPUT}, |
| 117 { ui::VKEY_U, ui::EF_CONTROL_DOWN, IDC_VIEW_SOURCE }, | 119 {ui::VKEY_U, ui::EF_CONTROL_DOWN, IDC_VIEW_SOURCE}, |
| 118 { ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, | 120 {ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS}, |
| 119 { ui::VKEY_SUBTRACT, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, | 121 {ui::VKEY_SUBTRACT, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS}, |
| 120 { ui::VKEY_0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, | 122 {ui::VKEY_0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL}, |
| 121 { ui::VKEY_NUMPAD0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, | 123 {ui::VKEY_NUMPAD0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL}, |
| 122 { ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 124 {ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS}, |
| 123 { ui::VKEY_ADD, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 125 {ui::VKEY_ADD, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS}, |
| 124 { ui::VKEY_F1, ui::EF_NONE, IDC_HELP_PAGE_VIA_KEYBOARD }, | 126 {ui::VKEY_F1, ui::EF_NONE, IDC_HELP_PAGE_VIA_KEYBOARD}, |
| 125 { ui::VKEY_F3, ui::EF_NONE, IDC_FIND_NEXT }, | 127 {ui::VKEY_F3, ui::EF_NONE, IDC_FIND_NEXT}, |
| 126 { ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_FIND_PREVIOUS }, | 128 {ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_FIND_PREVIOUS}, |
| 127 { ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB }, | 129 {ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB}, |
| 128 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, | 130 {ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW}, |
| 129 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, | 131 {ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD}, |
| 130 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 132 {ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE}, |
| 131 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 133 {ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE}, |
| 132 { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE }, | 134 {ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE}, |
| 133 { ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE }, | 135 {ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE}, |
| 134 { ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 136 {ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR}, |
| 135 { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, | 137 {ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN}, |
| 136 { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER }, | 138 {ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER}, |
| 137 | 139 |
| 138 // Platform-specific key maps. | 140 // Platform-specific key maps. |
| 139 #if defined(OS_LINUX) | 141 #if defined(OS_LINUX) |
| 140 { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, | 142 {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, |
| 141 { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, | 143 {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, |
| 142 { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, | 144 {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, |
| 143 { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD }, | 145 {ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD}, |
| 144 { ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 146 {ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE}, |
| 145 { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 147 {ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE}, |
| 146 #endif // defined(OS_LINUX) | 148 #endif // defined(OS_LINUX) |
| 147 | 149 |
| 148 #if defined(OS_CHROMEOS) | 150 #if defined(OS_CHROMEOS) |
| 149 // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. | 151 // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. |
| 150 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 152 {ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 151 IDC_CLEAR_BROWSING_DATA }, | 153 IDC_CLEAR_BROWSING_DATA}, |
| 152 { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD }, | 154 {ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD}, |
| 153 { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 155 {ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 154 IDC_HELP_PAGE_VIA_KEYBOARD }, | 156 IDC_HELP_PAGE_VIA_KEYBOARD}, |
| 155 { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER }, | 157 {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER}, |
| 156 { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP }, | 158 {ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP}, |
| 157 #else // OS_CHROMEOS | 159 #else // OS_CHROMEOS |
| 158 { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 160 {ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 159 IDC_CLEAR_BROWSING_DATA }, | 161 IDC_CLEAR_BROWSING_DATA}, |
| 160 { ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 162 {ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR}, |
| 161 { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 163 {ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR}, |
| 162 { ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR }, | 164 {ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR}, |
| 163 // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are handled | 165 // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are |
| 164 // via WM_APPCOMMAND. | 166 // handled |
| 165 { ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH }, | 167 // via WM_APPCOMMAND. |
| 166 { ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_SHOW_AVATAR_MENU}, | 168 {ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH}, |
| 167 // On ChromeOS, these keys are assigned to change UI scale. | 169 {ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_SHOW_AVATAR_MENU}, |
| 168 { ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 170 // On ChromeOS, these keys are assigned to change UI scale. |
| 169 { ui::VKEY_OEM_MINUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 171 {ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS}, |
| 170 IDC_ZOOM_MINUS }, | 172 {ui::VKEY_OEM_MINUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 173 IDC_ZOOM_MINUS}, |
| 171 // For each entry here add an entry into kChromeCmdId2AshActionId below | 174 // For each entry here add an entry into kChromeCmdId2AshActionId below |
| 172 // if Ash has a corresponding accelerator. | 175 // if Ash has a corresponding accelerator. |
| 173 #if defined(GOOGLE_CHROME_BUILD) | 176 #if defined(GOOGLE_CHROME_BUILD) |
| 174 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK }, | 177 {ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK}, |
| 175 #endif | 178 #endif |
| 176 { ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT }, | 179 {ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT}, |
| 177 { ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 180 {ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 178 IDC_NEW_INCOGNITO_WINDOW }, | 181 IDC_NEW_INCOGNITO_WINDOW}, |
| 179 { ui::VKEY_T, ui::EF_CONTROL_DOWN, IDC_NEW_TAB }, | 182 {ui::VKEY_T, ui::EF_CONTROL_DOWN, IDC_NEW_TAB}, |
| 180 { ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW }, | 183 {ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW}, |
| 181 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB }, | 184 {ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB}, |
| 182 #endif | 185 #endif |
| 183 }; | 186 }; |
| 184 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); | 187 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); |
| 185 | 188 |
| 186 #if defined(USE_ASH) | 189 #if defined(USE_ASH) |
| 187 // Below we map Chrome command ids to Ash action ids for commands that have | 190 // Below we map Chrome command ids to Ash action ids for commands that have |
| 188 // an shortcut that is handled by Ash (instead of Chrome). Adding entries | 191 // an shortcut that is handled by Ash (instead of Chrome). Adding entries |
| 189 // here will show shortcut text on menus. See comment above. | 192 // here will show shortcut text on menus. See comment above. |
| 190 struct ChromeCmdId2AshActionId { | 193 struct ChromeCmdId2AshActionId { |
| 191 const int chrome_cmd_id; | 194 const int chrome_cmd_id; |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); | 250 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); |
| 248 return true; | 251 return true; |
| 249 case IDC_PASTE: | 252 case IDC_PASTE: |
| 250 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); | 253 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); |
| 251 return true; | 254 return true; |
| 252 } | 255 } |
| 253 return false; | 256 return false; |
| 254 } | 257 } |
| 255 | 258 |
| 256 } // namespace chrome | 259 } // namespace chrome |
| OLD | NEW |