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

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

Issue 2616113002: Toggle High Contrast on Chrome OS should toggle on key down, not key up (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | no next file » | 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 {true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 65 {true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
66 OPEN_GET_HELP}, 66 OPEN_GET_HELP},
67 {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH}, 67 {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH},
68 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 68 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
69 TOUCH_HUD_MODE_CHANGE}, 69 TOUCH_HUD_MODE_CHANGE},
70 {true, ui::VKEY_I, 70 {true, ui::VKEY_I,
71 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, 71 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
72 TOUCH_HUD_CLEAR}, 72 TOUCH_HUD_CLEAR},
73 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 73 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
74 TOUCH_HUD_PROJECTION_TOGGLE}, 74 TOUCH_HUD_PROJECTION_TOGGLE},
75 {false, ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, 75 {true, ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
76 TOGGLE_HIGH_CONTRAST}, 76 TOGGLE_HIGH_CONTRAST},
77 {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 77 {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
78 TOGGLE_SPOKEN_FEEDBACK}, 78 TOGGLE_SPOKEN_FEEDBACK},
79 {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 79 {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
80 SWITCH_TO_PREVIOUS_USER}, 80 SWITCH_TO_PREVIOUS_USER},
81 {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 81 {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
82 SWITCH_TO_NEXT_USER}, 82 SWITCH_TO_NEXT_USER},
83 // Single shift release turns off caps lock. 83 // Single shift release turns off caps lock.
84 {false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, 84 {false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK},
85 {false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, 85 {false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK},
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 TOGGLE_WIFI, 538 TOGGLE_WIFI,
539 VOLUME_DOWN, 539 VOLUME_DOWN,
540 VOLUME_MUTE, 540 VOLUME_MUTE,
541 VOLUME_UP, 541 VOLUME_UP,
542 #endif // defined(OS_CHROMEOS) 542 #endif // defined(OS_CHROMEOS)
543 }; 543 };
544 544
545 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 545 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
546 546
547 } // namespace ash 547 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698