Chromium Code Reviews| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 154 {true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 154 {true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 155 WINDOW_POSITION_CENTER}, | 155 WINDOW_POSITION_CENTER}, |
| 156 {true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE}, | 156 {true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE}, |
| 157 {true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE}, | 157 {true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE}, |
| 158 | 158 |
| 159 // Media Player shortcuts. | 159 // Media Player shortcuts. |
| 160 {true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, | 160 {true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, |
| 161 {true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, | 161 {true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, |
| 162 {true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, | 162 {true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, |
| 163 | 163 |
| 164 // Voice Interaction shortcuts. | |
| 165 {true, ui::VKEY_A, ui::EF_COMMAND_DOWN, START_VOICE_INTERACTION}, | |
|
Yusuke Sato
2017/05/23 19:41:51
Shouldn't we also update chrome/browser/resources/
yueli
2017/05/23 22:59:56
Currently such accelerators should only be shown o
| |
| 166 // Temporary shortcut added for UX/PM exploration. | |
|
Yusuke Sato
2017/05/23 19:41:51
Then,
// TODO(ldap): Remove the accelerator.
?
yueli
2017/05/23 22:59:56
Done.
| |
| 167 {true, ui::VKEY_SPACE, ui::EF_COMMAND_DOWN, START_VOICE_INTERACTION}, | |
| 168 | |
| 164 // Debugging shortcuts that need to be available to end-users in | 169 // Debugging shortcuts that need to be available to end-users in |
| 165 // release builds. | 170 // release builds. |
| 166 {true, ui::VKEY_U, kDebugModifier, PRINT_UI_HIERARCHIES}, | 171 {true, ui::VKEY_U, kDebugModifier, PRINT_UI_HIERARCHIES}, |
| 167 | 172 |
| 168 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and | 173 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and |
| 169 // VKEY_MEDIA_LAUNCH_MAIL. | 174 // VKEY_MEDIA_LAUNCH_MAIL. |
| 170 }; | 175 }; |
| 171 | 176 |
| 172 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); | 177 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); |
| 173 | 178 |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 502 TOGGLE_SPOKEN_FEEDBACK, | 507 TOGGLE_SPOKEN_FEEDBACK, |
| 503 TOGGLE_WIFI, | 508 TOGGLE_WIFI, |
| 504 VOLUME_DOWN, | 509 VOLUME_DOWN, |
| 505 VOLUME_MUTE, | 510 VOLUME_MUTE, |
| 506 VOLUME_UP, | 511 VOLUME_UP, |
| 507 }; | 512 }; |
| 508 | 513 |
| 509 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 514 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
| 510 | 515 |
| 511 } // namespace ash | 516 } // namespace ash |
| OLD | NEW |