OLD | NEW |
---|---|
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
65 TOUCH_HUD_MODE_CHANGE }, | 65 TOUCH_HUD_MODE_CHANGE }, |
66 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, | 66 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, |
67 TOUCH_HUD_CLEAR }, | 67 TOUCH_HUD_CLEAR }, |
68 { true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 68 { true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
69 TOUCH_HUD_PROJECTION_TOGGLE }, | 69 TOUCH_HUD_PROJECTION_TOGGLE }, |
70 // Accessibility: Spoken feedback shortcuts. The first one is to toggle | 70 // Accessibility: Spoken feedback shortcuts. The first one is to toggle |
71 // spoken feedback on or off. The others are only valid when | 71 // spoken feedback on or off. The others are only valid when |
72 // spoken feedback is enabled. | 72 // spoken feedback is enabled. |
73 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 73 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
74 TOGGLE_SPOKEN_FEEDBACK }, | 74 TOGGLE_SPOKEN_FEEDBACK }, |
75 { true, ui::VKEY_CONTROL, ui::EF_CONTROL_DOWN, SILENCE_SPOKEN_FEEDBACK}, | |
dmazzoni
2016/02/17 04:57:15
Great! Please remove SILENCE_SPOKEN_FEEDBACK from
David Tseng
2016/02/17 19:30:11
Done.
| |
76 { true, ui::VKEY_LCONTROL, ui::EF_CONTROL_DOWN, SILENCE_SPOKEN_FEEDBACK}, | |
77 { true, ui::VKEY_RCONTROL, ui::EF_CONTROL_DOWN, SILENCE_SPOKEN_FEEDBACK}, | |
78 { true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 75 { true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
79 SWITCH_TO_PREVIOUS_USER }, | 76 SWITCH_TO_PREVIOUS_USER }, |
80 { true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 77 { true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
81 SWITCH_TO_NEXT_USER }, | 78 SWITCH_TO_NEXT_USER }, |
82 // Turning the TouchView maximizing mode on via hotkey for the time being. | 79 // Turning the TouchView maximizing mode on via hotkey for the time being. |
83 // TODO(skuhne): Remove once the test isn't needed anymore. | 80 // TODO(skuhne): Remove once the test isn't needed anymore. |
84 { true, ui::VKEY_8, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, | 81 { true, ui::VKEY_8, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, |
85 TOGGLE_TOUCH_VIEW_TESTING }, | 82 TOGGLE_TOUCH_VIEW_TESTING }, |
86 // Single shift release turns off caps lock. | 83 // Single shift release turns off caps lock. |
87 { false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK }, | 84 { false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK }, |
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
544 TOGGLE_WIFI, | 541 TOGGLE_WIFI, |
545 VOLUME_DOWN, | 542 VOLUME_DOWN, |
546 VOLUME_MUTE, | 543 VOLUME_MUTE, |
547 VOLUME_UP, | 544 VOLUME_UP, |
548 #endif // defined(OS_CHROMEOS) | 545 #endif // defined(OS_CHROMEOS) |
549 }; | 546 }; |
550 | 547 |
551 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 548 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
552 | 549 |
553 } // namespace ash | 550 } // namespace ash |
OLD | NEW |