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

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

Issue 2448663002: Revert of Add Ctrl+Alt+H as global shortcut to toggle high contrast mode. (Closed)
Patch Set: Created 4 years, 1 month 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/common/accelerators/accelerator_table.h ('k') | tools/metrics/actions/actions.xml » ('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/common/accelerators/accelerator_table.h" 5 #include "ash/common/accelerators/accelerator_table.h"
6 6
7 #include "ash/common/strings/grit/ash_strings.h" 7 #include "ash/common/strings/grit/ash_strings.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 {true, ui::VKEY_G, 68 {true, ui::VKEY_G,
69 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 69 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
70 DISABLE_GPU_WATCHDOG}, 70 DISABLE_GPU_WATCHDOG},
71 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 71 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
72 TOUCH_HUD_MODE_CHANGE}, 72 TOUCH_HUD_MODE_CHANGE},
73 {true, ui::VKEY_I, 73 {true, ui::VKEY_I,
74 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, 74 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
75 TOUCH_HUD_CLEAR}, 75 TOUCH_HUD_CLEAR},
76 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 76 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
77 TOUCH_HUD_PROJECTION_TOGGLE}, 77 TOUCH_HUD_PROJECTION_TOGGLE},
78 {true, ui::VKEY_H, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 78 // Accessibility: Spoken feedback shortcuts. The first one is to toggle
79 TOGGLE_HIGH_CONTRAST}, 79 // spoken feedback on or off. The others are only valid when
80 // spoken feedback is enabled.
80 {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 81 {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
81 TOGGLE_SPOKEN_FEEDBACK}, 82 TOGGLE_SPOKEN_FEEDBACK},
82 {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 83 {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
83 SWITCH_TO_PREVIOUS_USER}, 84 SWITCH_TO_PREVIOUS_USER},
84 {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 85 {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
85 SWITCH_TO_NEXT_USER}, 86 SWITCH_TO_NEXT_USER},
86 // Single shift release turns off caps lock. 87 // Single shift release turns off caps lock.
87 {false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, 88 {false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK},
88 {false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, 89 {false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK},
89 {false, ui::VKEY_RSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, 90 {false, ui::VKEY_RSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK},
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 BRIGHTNESS_UP, 336 BRIGHTNESS_UP,
336 DEBUG_TOGGLE_TOUCH_PAD, 337 DEBUG_TOGGLE_TOUCH_PAD,
337 DEBUG_TOGGLE_TOUCH_SCREEN, 338 DEBUG_TOGGLE_TOUCH_SCREEN,
338 DEBUG_TOGGLE_TOUCH_VIEW, 339 DEBUG_TOGGLE_TOUCH_VIEW,
339 DEV_ADD_REMOVE_DISPLAY, 340 DEV_ADD_REMOVE_DISPLAY,
340 DISABLE_CAPS_LOCK, 341 DISABLE_CAPS_LOCK,
341 DISABLE_GPU_WATCHDOG, 342 DISABLE_GPU_WATCHDOG,
342 KEYBOARD_BRIGHTNESS_DOWN, 343 KEYBOARD_BRIGHTNESS_DOWN,
343 KEYBOARD_BRIGHTNESS_UP, 344 KEYBOARD_BRIGHTNESS_UP,
344 TOGGLE_CAPS_LOCK, 345 TOGGLE_CAPS_LOCK,
345 TOGGLE_HIGH_CONTRAST,
346 TOGGLE_SPOKEN_FEEDBACK, 346 TOGGLE_SPOKEN_FEEDBACK,
347 TOGGLE_MIRROR_MODE, 347 TOGGLE_MIRROR_MODE,
348 TOGGLE_WIFI, 348 TOGGLE_WIFI,
349 TOUCH_HUD_CLEAR, 349 TOUCH_HUD_CLEAR,
350 VOLUME_DOWN, 350 VOLUME_DOWN,
351 VOLUME_MUTE, 351 VOLUME_MUTE,
352 VOLUME_UP, 352 VOLUME_UP,
353 #endif 353 #endif
354 #if defined(OS_CHROMEOS) && !defined(NDEBUG) 354 #if defined(OS_CHROMEOS) && !defined(NDEBUG)
355 POWER_PRESSED, 355 POWER_PRESSED,
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 DISABLE_CAPS_LOCK, 399 DISABLE_CAPS_LOCK,
400 KEYBOARD_BRIGHTNESS_DOWN, 400 KEYBOARD_BRIGHTNESS_DOWN,
401 KEYBOARD_BRIGHTNESS_UP, 401 KEYBOARD_BRIGHTNESS_UP,
402 LOCK_SCREEN, 402 LOCK_SCREEN,
403 POWER_PRESSED, 403 POWER_PRESSED,
404 POWER_RELEASED, 404 POWER_RELEASED,
405 SHOW_IME_MENU_BUBBLE, 405 SHOW_IME_MENU_BUBBLE,
406 SUSPEND, 406 SUSPEND,
407 SWAP_PRIMARY_DISPLAY, 407 SWAP_PRIMARY_DISPLAY,
408 TOGGLE_CAPS_LOCK, 408 TOGGLE_CAPS_LOCK,
409 TOGGLE_HIGH_CONTRAST,
410 TOGGLE_MIRROR_MODE, 409 TOGGLE_MIRROR_MODE,
411 TOGGLE_SPOKEN_FEEDBACK, 410 TOGGLE_SPOKEN_FEEDBACK,
412 TOGGLE_WIFI, 411 TOGGLE_WIFI,
413 VOLUME_DOWN, 412 VOLUME_DOWN,
414 VOLUME_MUTE, 413 VOLUME_MUTE,
415 VOLUME_UP, 414 VOLUME_UP,
416 #endif 415 #endif
417 }; 416 };
418 417
419 const size_t kActionsAllowedAtModalWindowLength = 418 const size_t kActionsAllowedAtModalWindowLength =
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 DEBUG_TOGGLE_TOUCH_PAD, 462 DEBUG_TOGGLE_TOUCH_PAD,
464 DEBUG_TOGGLE_TOUCH_SCREEN, 463 DEBUG_TOGGLE_TOUCH_SCREEN,
465 DISABLE_CAPS_LOCK, 464 DISABLE_CAPS_LOCK,
466 DISABLE_GPU_WATCHDOG, 465 DISABLE_GPU_WATCHDOG,
467 KEYBOARD_BRIGHTNESS_DOWN, 466 KEYBOARD_BRIGHTNESS_DOWN,
468 KEYBOARD_BRIGHTNESS_UP, 467 KEYBOARD_BRIGHTNESS_UP,
469 POWER_PRESSED, 468 POWER_PRESSED,
470 POWER_RELEASED, 469 POWER_RELEASED,
471 SWAP_PRIMARY_DISPLAY, 470 SWAP_PRIMARY_DISPLAY,
472 TOGGLE_CAPS_LOCK, 471 TOGGLE_CAPS_LOCK,
473 TOGGLE_HIGH_CONTRAST,
474 TOGGLE_MIRROR_MODE, 472 TOGGLE_MIRROR_MODE,
475 TOGGLE_SPOKEN_FEEDBACK, 473 TOGGLE_SPOKEN_FEEDBACK,
476 TOGGLE_WIFI, 474 TOGGLE_WIFI,
477 TOUCH_HUD_CLEAR, 475 TOUCH_HUD_CLEAR,
478 VOLUME_DOWN, 476 VOLUME_DOWN,
479 VOLUME_MUTE, 477 VOLUME_MUTE,
480 VOLUME_UP, 478 VOLUME_UP,
481 #endif // defined(OS_CHROMEOS) 479 #endif // defined(OS_CHROMEOS)
482 }; 480 };
483 481
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 TAKE_SCREENSHOT, 524 TAKE_SCREENSHOT,
527 #if defined(OS_CHROMEOS) 525 #if defined(OS_CHROMEOS)
528 BRIGHTNESS_DOWN, 526 BRIGHTNESS_DOWN,
529 BRIGHTNESS_UP, 527 BRIGHTNESS_UP,
530 DEBUG_TOGGLE_TOUCH_PAD, 528 DEBUG_TOGGLE_TOUCH_PAD,
531 DEBUG_TOGGLE_TOUCH_SCREEN, 529 DEBUG_TOGGLE_TOUCH_SCREEN,
532 DISABLE_CAPS_LOCK, 530 DISABLE_CAPS_LOCK,
533 KEYBOARD_BRIGHTNESS_DOWN, 531 KEYBOARD_BRIGHTNESS_DOWN,
534 KEYBOARD_BRIGHTNESS_UP, 532 KEYBOARD_BRIGHTNESS_UP,
535 TOGGLE_CAPS_LOCK, 533 TOGGLE_CAPS_LOCK,
536 TOGGLE_HIGH_CONTRAST,
537 TOGGLE_SPOKEN_FEEDBACK, 534 TOGGLE_SPOKEN_FEEDBACK,
538 TOGGLE_WIFI, 535 TOGGLE_WIFI,
539 VOLUME_DOWN, 536 VOLUME_DOWN,
540 VOLUME_MUTE, 537 VOLUME_MUTE,
541 VOLUME_UP, 538 VOLUME_UP,
542 #endif // defined(OS_CHROMEOS) 539 #endif // defined(OS_CHROMEOS)
543 }; 540 };
544 541
545 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 542 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
546 543
547 } // namespace ash 544 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/accelerators/accelerator_table.h ('k') | tools/metrics/actions/actions.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698