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

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

Issue 1213513003: Revert of Support Compat mode inside of the desktop tree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@commands_alt
Patch Set: Created 5 years, 6 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
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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 // Media Player shortcuts. 164 // Media Player shortcuts.
165 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, 165 { true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK},
166 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, 166 { true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE},
167 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, 167 { true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK},
168 168
169 // Debugging shortcuts that need to be available to end-users in 169 // Debugging shortcuts that need to be available to end-users in
170 // release builds. 170 // release builds.
171 { true, ui::VKEY_U, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, 171 { true, ui::VKEY_U, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
172 PRINT_UI_HIERARCHIES }, 172 PRINT_UI_HIERARCHIES },
173 173
174 { false, ui::VKEY_HOME, ui::EF_SHIFT_DOWN, ACCESSIBLE_FOCUS_PREVIOUS},
175 { false, ui::VKEY_PRIOR, ui::EF_SHIFT_DOWN, ACCESSIBLE_FOCUS_PREVIOUS},
176 { false, ui::VKEY_END, ui::EF_SHIFT_DOWN, ACCESSIBLE_FOCUS_NEXT},
177 { false, ui::VKEY_NEXT, ui::EF_SHIFT_DOWN, ACCESSIBLE_FOCUS_NEXT},
178
174 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and 179 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and
175 // VKEY_MEDIA_LAUNCH_MAIL. 180 // VKEY_MEDIA_LAUNCH_MAIL.
176 }; 181 };
177 182
178 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); 183 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
179 184
180 const AcceleratorData kDebugAcceleratorData[] = { 185 const AcceleratorData kDebugAcceleratorData[] = {
181 #if defined(OS_CHROMEOS) 186 #if defined(OS_CHROMEOS)
182 // Extra shortcut for debug build to control magnifier on linux desktop. 187 // Extra shortcut for debug build to control magnifier on linux desktop.
183 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN, 188 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN,
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 VOLUME_DOWN, 401 VOLUME_DOWN,
397 VOLUME_MUTE, 402 VOLUME_MUTE,
398 VOLUME_UP, 403 VOLUME_UP,
399 #endif // defined(OS_CHROMEOS) 404 #endif // defined(OS_CHROMEOS)
400 }; 405 };
401 406
402 const size_t kActionsAllowedInAppModeLength = 407 const size_t kActionsAllowedInAppModeLength =
403 arraysize(kActionsAllowedInAppMode); 408 arraysize(kActionsAllowedInAppMode);
404 409
405 const AcceleratorAction kActionsNeedingWindow[] = { 410 const AcceleratorAction kActionsNeedingWindow[] = {
411 ACCESSIBLE_FOCUS_NEXT,
412 ACCESSIBLE_FOCUS_PREVIOUS,
406 CYCLE_BACKWARD_MRU, 413 CYCLE_BACKWARD_MRU,
407 CYCLE_FORWARD_MRU, 414 CYCLE_FORWARD_MRU,
408 TOGGLE_OVERVIEW, 415 TOGGLE_OVERVIEW,
409 WINDOW_CYCLE_SNAP_DOCK_LEFT, 416 WINDOW_CYCLE_SNAP_DOCK_LEFT,
410 WINDOW_CYCLE_SNAP_DOCK_RIGHT, 417 WINDOW_CYCLE_SNAP_DOCK_RIGHT,
411 WINDOW_MINIMIZE, 418 WINDOW_MINIMIZE,
412 TOGGLE_FULLSCREEN, 419 TOGGLE_FULLSCREEN,
413 TOGGLE_MAXIMIZED, 420 TOGGLE_MAXIMIZED,
414 WINDOW_POSITION_CENTER, 421 WINDOW_POSITION_CENTER,
415 ROTATE_WINDOW, 422 ROTATE_WINDOW,
416 }; 423 };
417 424
418 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow); 425 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow);
419 426
420 } // namespace ash 427 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698