Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(417)

Side by Side Diff: ash/accelerators/accelerator_table.cc

Issue 2898273002: Move Voice Interaction shortcut to accelerator_controller.cc (Closed)
Patch Set: Move Voice Interaction shortcut to accelerator_controller.cc Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/accelerators/accelerator_table_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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},
166 // Temporary shortcut added for UX/PM exploration.
167 // TODO(updowndota): Remove the temporary shortcut.
168 {true, ui::VKEY_SPACE, ui::EF_COMMAND_DOWN, START_VOICE_INTERACTION},
169
164 // Debugging shortcuts that need to be available to end-users in 170 // Debugging shortcuts that need to be available to end-users in
165 // release builds. 171 // release builds.
166 {true, ui::VKEY_U, kDebugModifier, PRINT_UI_HIERARCHIES}, 172 {true, ui::VKEY_U, kDebugModifier, PRINT_UI_HIERARCHIES},
167 173
168 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and 174 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and
169 // VKEY_MEDIA_LAUNCH_MAIL. 175 // VKEY_MEDIA_LAUNCH_MAIL.
170 }; 176 };
171 177
172 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); 178 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
173 179
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 TOGGLE_SPOKEN_FEEDBACK, 508 TOGGLE_SPOKEN_FEEDBACK,
503 TOGGLE_WIFI, 509 TOGGLE_WIFI,
504 VOLUME_DOWN, 510 VOLUME_DOWN,
505 VOLUME_MUTE, 511 VOLUME_MUTE,
506 VOLUME_UP, 512 VOLUME_UP,
507 }; 513 };
508 514
509 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 515 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
510 516
511 } // namespace ash 517 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/accelerators/accelerator_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698