| 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 "ash/accelerators/accelerator_table.h" | 5 #include "ash/accelerators/accelerator_table.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "ui/base/events.h" | 8 #include "ui/base/events.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, | 31 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, |
| 32 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, | 32 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, |
| 33 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, | 33 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, |
| 34 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER }, | 34 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER }, |
| 35 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, | 35 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, |
| 36 #endif | 36 #endif |
| 37 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, | 37 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, |
| 38 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 38 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 39 TOGGLE_SPOKEN_FEEDBACK }, | 39 TOGGLE_SPOKEN_FEEDBACK }, |
| 40 | 40 |
| 41 // When you change the shortcut for NEW_INCOGNITO_WINDOW or NEW_WINDOW, | 41 // When you change the shortcuts for the commands listed below from NEW_TAB |
| 42 // you also need to modify ToolbarView::GetAcceleratorForCommandId() in | 42 // to OPEN_HISTORY, you also need to modify |
| 43 // ToolbarView::GetAcceleratorForCommandId() in |
| 43 // chrome/browser/ui/views/toolbar_view.cc. | 44 // chrome/browser/ui/views/toolbar_view.cc. |
| 45 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB }, |
| 44 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 46 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 45 NEW_INCOGNITO_WINDOW }, | 47 NEW_INCOGNITO_WINDOW }, |
| 46 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW }, | 48 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW }, |
| 49 { true, ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 50 OPEN_BOOKMARK_MANAGER }, |
| 51 { true, ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 52 OPEN_CLEAR_BROWSING_DATA }, |
| 53 { true, ui::VKEY_J, ui::EF_CONTROL_DOWN, OPEN_DOWNLOADS }, |
| 54 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, OPEN_HELP_PAGE }, |
| 55 { true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 56 OPEN_HELP_PAGE }, |
| 57 { true, ui::VKEY_H, ui::EF_CONTROL_DOWN, OPEN_HISTORY }, |
| 47 | 58 |
| 48 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR }, | 59 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR }, |
| 60 { true, ui::VKEY_HOME, ui::EF_ALT_DOWN, OPEN_HOME }, |
| 61 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, |
| 49 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, | 62 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, |
| 50 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 63 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 51 TAKE_PARTIAL_SCREENSHOT }, | 64 TAKE_PARTIAL_SCREENSHOT }, |
| 52 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, | 65 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, |
| 53 // On Chrome OS, Search key is mapped to LWIN. | 66 // On Chrome OS, Search key is mapped to LWIN. |
| 54 { true, ui::VKEY_LWIN, ui::EF_NONE, SEARCH_KEY }, | 67 { true, ui::VKEY_LWIN, ui::EF_NONE, SEARCH_KEY }, |
| 55 { true, ui::VKEY_LWIN, ui::EF_CONTROL_DOWN, TOGGLE_APP_LIST }, | 68 { true, ui::VKEY_LWIN, ui::EF_CONTROL_DOWN, TOGGLE_APP_LIST }, |
| 56 { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK }, | 69 { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK }, |
| 57 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN }, | 70 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN }, |
| 58 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP }, | 71 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP }, |
| 59 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE }, | 72 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE }, |
| 60 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, | 73 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, |
| 61 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN }, | 74 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN }, |
| 62 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, | 75 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, |
| 63 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, | 76 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, |
| 64 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, | 77 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, |
| 65 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, | 78 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, |
| 66 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_TRAY }, | 79 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_TRAY }, |
| 67 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 80 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 68 SHOW_KEYBOARD_OVERLAY }, | 81 SHOW_KEYBOARD_OVERLAY }, |
| 69 { true, ui::VKEY_OEM_2, | 82 { true, ui::VKEY_OEM_2, |
| 70 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 83 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 71 SHOW_KEYBOARD_OVERLAY }, | 84 SHOW_KEYBOARD_OVERLAY }, |
| 72 { true, ui::VKEY_F1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK }, | 85 { true, ui::VKEY_F1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK }, |
| 86 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER }, |
| 73 { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 }, | 87 { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 }, |
| 74 { true, ui::VKEY_2, ui::EF_ALT_DOWN, SELECT_WIN_1 }, | 88 { true, ui::VKEY_2, ui::EF_ALT_DOWN, SELECT_WIN_1 }, |
| 75 { true, ui::VKEY_3, ui::EF_ALT_DOWN, SELECT_WIN_2 }, | 89 { true, ui::VKEY_3, ui::EF_ALT_DOWN, SELECT_WIN_2 }, |
| 76 { true, ui::VKEY_4, ui::EF_ALT_DOWN, SELECT_WIN_3 }, | 90 { true, ui::VKEY_4, ui::EF_ALT_DOWN, SELECT_WIN_3 }, |
| 77 { true, ui::VKEY_5, ui::EF_ALT_DOWN, SELECT_WIN_4 }, | 91 { true, ui::VKEY_5, ui::EF_ALT_DOWN, SELECT_WIN_4 }, |
| 78 { true, ui::VKEY_6, ui::EF_ALT_DOWN, SELECT_WIN_5 }, | 92 { true, ui::VKEY_6, ui::EF_ALT_DOWN, SELECT_WIN_5 }, |
| 79 { true, ui::VKEY_7, ui::EF_ALT_DOWN, SELECT_WIN_6 }, | 93 { true, ui::VKEY_7, ui::EF_ALT_DOWN, SELECT_WIN_6 }, |
| 80 { true, ui::VKEY_8, ui::EF_ALT_DOWN, SELECT_WIN_7 }, | 94 { true, ui::VKEY_8, ui::EF_ALT_DOWN, SELECT_WIN_7 }, |
| 81 { true, ui::VKEY_9, ui::EF_ALT_DOWN, SELECT_LAST_WIN }, | 95 { true, ui::VKEY_9, ui::EF_ALT_DOWN, SELECT_LAST_WIN }, |
| 82 | 96 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 PRINT_LAYER_HIERARCHY, | 160 PRINT_LAYER_HIERARCHY, |
| 147 PRINT_WINDOW_HIERARCHY, | 161 PRINT_WINDOW_HIERARCHY, |
| 148 ROTATE_SCREEN, | 162 ROTATE_SCREEN, |
| 149 #endif | 163 #endif |
| 150 }; | 164 }; |
| 151 | 165 |
| 152 const size_t kActionsAllowedAtLoginScreenLength = | 166 const size_t kActionsAllowedAtLoginScreenLength = |
| 153 arraysize(kActionsAllowedAtLoginScreen); | 167 arraysize(kActionsAllowedAtLoginScreen); |
| 154 | 168 |
| 155 } // namespace ash | 169 } // namespace ash |
| OLD | NEW |