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/macros.h" | 8 #include "base/macros.h" |
9 | 9 |
10 namespace ash { | 10 namespace ash { |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 119 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
120 ROTATE_WINDOW }, | 120 ROTATE_WINDOW }, |
121 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, | 121 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, |
122 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, | 122 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, |
123 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should | 123 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should |
124 // act on release instead of press when using Search as a modifier key for | 124 // act on release instead of press when using Search as a modifier key for |
125 // extended keyboard shortcuts. | 125 // extended keyboard shortcuts. |
126 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, | 126 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, |
127 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN }, | 127 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN }, |
128 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN }, | 128 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN }, |
| 129 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN, UNPIN }, |
129 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF }, | 130 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF }, |
130 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, | 131 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, |
131 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 132 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
132 SHOW_KEYBOARD_OVERLAY }, | 133 SHOW_KEYBOARD_OVERLAY }, |
133 { true, ui::VKEY_OEM_2, | 134 { true, ui::VKEY_OEM_2, |
134 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 135 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
135 SHOW_KEYBOARD_OVERLAY }, | 136 SHOW_KEYBOARD_OVERLAY }, |
136 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, | 137 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, |
137 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 138 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
138 SHOW_MESSAGE_CENTER_BUBBLE }, | 139 SHOW_MESSAGE_CENTER_BUBBLE }, |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
505 #endif // defined(OS_CHROMEOS) | 506 #endif // defined(OS_CHROMEOS) |
506 }; | 507 }; |
507 | 508 |
508 const size_t kActionsAllowedInAppModeOrPinnedModeLength = | 509 const size_t kActionsAllowedInAppModeOrPinnedModeLength = |
509 arraysize(kActionsAllowedInAppModeOrPinnedMode); | 510 arraysize(kActionsAllowedInAppModeOrPinnedMode); |
510 | 511 |
511 const AcceleratorAction kActionsAllowedInPinnedMode[] = { | 512 const AcceleratorAction kActionsAllowedInPinnedMode[] = { |
512 TAKE_WINDOW_SCREENSHOT, | 513 TAKE_WINDOW_SCREENSHOT, |
513 TAKE_PARTIAL_SCREENSHOT, | 514 TAKE_PARTIAL_SCREENSHOT, |
514 TAKE_SCREENSHOT, | 515 TAKE_SCREENSHOT, |
| 516 UNPIN, |
515 #if defined(OS_CHROMEOS) | 517 #if defined(OS_CHROMEOS) |
516 LOCK_SCREEN, | 518 LOCK_SCREEN, |
517 SUSPEND, | 519 SUSPEND, |
518 #endif | 520 #endif |
519 }; | 521 }; |
520 | 522 |
521 const size_t kActionsAllowedInPinnedModeLength = | 523 const size_t kActionsAllowedInPinnedModeLength = |
522 arraysize(kActionsAllowedInPinnedMode); | 524 arraysize(kActionsAllowedInPinnedMode); |
523 | 525 |
524 const AcceleratorAction kActionsNeedingWindow[] = { | 526 const AcceleratorAction kActionsNeedingWindow[] = { |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
560 TOGGLE_WIFI, | 562 TOGGLE_WIFI, |
561 VOLUME_DOWN, | 563 VOLUME_DOWN, |
562 VOLUME_MUTE, | 564 VOLUME_MUTE, |
563 VOLUME_UP, | 565 VOLUME_UP, |
564 #endif // defined(OS_CHROMEOS) | 566 #endif // defined(OS_CHROMEOS) |
565 }; | 567 }; |
566 | 568 |
567 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 569 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
568 | 570 |
569 } // namespace ash | 571 } // namespace ash |
OLD | NEW |