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

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

Issue 1191783002: Support Compat mode inside of the desktop tree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@commands_alt
Patch Set: Rebase. Created 5 years, 5 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
179 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and 174 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and
180 // VKEY_MEDIA_LAUNCH_MAIL. 175 // VKEY_MEDIA_LAUNCH_MAIL.
181 }; 176 };
182 177
183 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); 178 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
184 179
185 const AcceleratorData kDebugAcceleratorData[] = { 180 const AcceleratorData kDebugAcceleratorData[] = {
186 #if defined(OS_CHROMEOS) 181 #if defined(OS_CHROMEOS)
187 // Extra shortcut for debug build to control magnifier on linux desktop. 182 // Extra shortcut for debug build to control magnifier on linux desktop.
188 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN, 183 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN,
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 VOLUME_DOWN, 396 VOLUME_DOWN,
402 VOLUME_MUTE, 397 VOLUME_MUTE,
403 VOLUME_UP, 398 VOLUME_UP,
404 #endif // defined(OS_CHROMEOS) 399 #endif // defined(OS_CHROMEOS)
405 }; 400 };
406 401
407 const size_t kActionsAllowedInAppModeLength = 402 const size_t kActionsAllowedInAppModeLength =
408 arraysize(kActionsAllowedInAppMode); 403 arraysize(kActionsAllowedInAppMode);
409 404
410 const AcceleratorAction kActionsNeedingWindow[] = { 405 const AcceleratorAction kActionsNeedingWindow[] = {
411 ACCESSIBLE_FOCUS_NEXT,
412 ACCESSIBLE_FOCUS_PREVIOUS,
413 CYCLE_BACKWARD_MRU, 406 CYCLE_BACKWARD_MRU,
414 CYCLE_FORWARD_MRU, 407 CYCLE_FORWARD_MRU,
415 TOGGLE_OVERVIEW, 408 TOGGLE_OVERVIEW,
416 WINDOW_CYCLE_SNAP_DOCK_LEFT, 409 WINDOW_CYCLE_SNAP_DOCK_LEFT,
417 WINDOW_CYCLE_SNAP_DOCK_RIGHT, 410 WINDOW_CYCLE_SNAP_DOCK_RIGHT,
418 WINDOW_MINIMIZE, 411 WINDOW_MINIMIZE,
419 TOGGLE_FULLSCREEN, 412 TOGGLE_FULLSCREEN,
420 TOGGLE_MAXIMIZED, 413 TOGGLE_MAXIMIZED,
421 WINDOW_POSITION_CENTER, 414 WINDOW_POSITION_CENTER,
422 ROTATE_WINDOW, 415 ROTATE_WINDOW,
423 }; 416 };
424 417
425 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow); 418 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow);
426 419
427 } // namespace ash 420 } // 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