| 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 "ash/strings/grit/ash_strings.h" | 7 #include "ash/strings/grit/ash_strings.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 ROTATE_WINDOW }, | 129 ROTATE_WINDOW }, |
| 130 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, | 130 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, |
| 131 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, | 131 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, |
| 132 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should | 132 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should |
| 133 // act on release instead of press when using Search as a modifier key for | 133 // act on release instead of press when using Search as a modifier key for |
| 134 // extended keyboard shortcuts. | 134 // extended keyboard shortcuts. |
| 135 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, | 135 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, |
| 136 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN }, | 136 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN }, |
| 137 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN }, | 137 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN }, |
| 138 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF }, | 138 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF }, |
| 139 { true, ui::VKEY_A, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 140 SHOW_TEST_SURFACE_OVERLAY }, |
| 139 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, | 141 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, |
| 140 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 142 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 141 SHOW_KEYBOARD_OVERLAY }, | 143 SHOW_KEYBOARD_OVERLAY }, |
| 142 { true, ui::VKEY_OEM_2, | 144 { true, ui::VKEY_OEM_2, |
| 143 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 145 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 144 SHOW_KEYBOARD_OVERLAY }, | 146 SHOW_KEYBOARD_OVERLAY }, |
| 145 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, | 147 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, |
| 146 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 148 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 147 SHOW_MESSAGE_CENTER_BUBBLE }, | 149 SHOW_MESSAGE_CENTER_BUBBLE }, |
| 148 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 150 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 MEDIA_PLAY_PAUSE, | 360 MEDIA_PLAY_PAUSE, |
| 359 MEDIA_PREV_TRACK, | 361 MEDIA_PREV_TRACK, |
| 360 NEXT_IME, | 362 NEXT_IME, |
| 361 OPEN_FEEDBACK_PAGE, | 363 OPEN_FEEDBACK_PAGE, |
| 362 PREVIOUS_IME, | 364 PREVIOUS_IME, |
| 363 PRINT_UI_HIERARCHIES, | 365 PRINT_UI_HIERARCHIES, |
| 364 ROTATE_SCREEN, | 366 ROTATE_SCREEN, |
| 365 SCALE_UI_UP, | 367 SCALE_UI_UP, |
| 366 SCALE_UI_DOWN, | 368 SCALE_UI_DOWN, |
| 367 SCALE_UI_RESET, | 369 SCALE_UI_RESET, |
| 370 SHOW_TEST_SURFACE_OVERLAY, |
| 368 SHOW_KEYBOARD_OVERLAY, | 371 SHOW_KEYBOARD_OVERLAY, |
| 369 SWITCH_IME, | 372 SWITCH_IME, |
| 370 TAKE_PARTIAL_SCREENSHOT, | 373 TAKE_PARTIAL_SCREENSHOT, |
| 371 TAKE_SCREENSHOT, | 374 TAKE_SCREENSHOT, |
| 372 #if defined(OS_CHROMEOS) | 375 #if defined(OS_CHROMEOS) |
| 373 BRIGHTNESS_DOWN, | 376 BRIGHTNESS_DOWN, |
| 374 BRIGHTNESS_UP, | 377 BRIGHTNESS_UP, |
| 375 DEBUG_ADD_REMOVE_DISPLAY, | 378 DEBUG_ADD_REMOVE_DISPLAY, |
| 376 DISABLE_CAPS_LOCK, | 379 DISABLE_CAPS_LOCK, |
| 377 KEYBOARD_BRIGHTNESS_DOWN, | 380 KEYBOARD_BRIGHTNESS_DOWN, |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 497 TOGGLE_WIFI, | 500 TOGGLE_WIFI, |
| 498 VOLUME_DOWN, | 501 VOLUME_DOWN, |
| 499 VOLUME_MUTE, | 502 VOLUME_MUTE, |
| 500 VOLUME_UP, | 503 VOLUME_UP, |
| 501 #endif // defined(OS_CHROMEOS) | 504 #endif // defined(OS_CHROMEOS) |
| 502 }; | 505 }; |
| 503 | 506 |
| 504 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 507 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
| 505 | 508 |
| 506 } // namespace ash | 509 } // namespace ash |
| OLD | NEW |