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

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

Issue 10694118: Add shortcuts for keyboard brightness (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('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/accelerators/accelerator_table.h" 5 #include "ash/accelerators/accelerator_table.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "ui/base/events.h" 8 #include "ui/base/events.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_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, 68 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB },
69 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, 69 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT },
70 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 70 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
71 TAKE_PARTIAL_SCREENSHOT }, 71 TAKE_PARTIAL_SCREENSHOT },
72 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, 72 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
73 // On Chrome OS, Search key is mapped to LWIN. 73 // On Chrome OS, Search key is mapped to LWIN.
74 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, 74 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
75 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST }, 75 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST },
76 { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK }, 76 { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK },
77 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN }, 77 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN },
78 { true, ui::VKEY_F6, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN },
78 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP }, 79 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP },
80 { true, ui::VKEY_F7, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP },
79 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE }, 81 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE },
80 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 82 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
81 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN }, 83 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN },
82 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 84 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
83 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, 85 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP },
84 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, 86 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
85 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, 87 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER },
86 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY }, 88 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY },
87 { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, 89 { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
88 { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT}, 90 { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT},
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 }; 148 };
147 149
148 const size_t kReservedActionsLength = arraysize(kReservedActions); 150 const size_t kReservedActionsLength = arraysize(kReservedActions);
149 151
150 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = { 152 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
151 BRIGHTNESS_DOWN, 153 BRIGHTNESS_DOWN,
152 BRIGHTNESS_UP, 154 BRIGHTNESS_UP,
153 #if defined(OS_CHROMEOS) 155 #if defined(OS_CHROMEOS)
154 CYCLE_DISPLAY_MODE, 156 CYCLE_DISPLAY_MODE,
155 #endif // defined(OS_CHROMEOS) 157 #endif // defined(OS_CHROMEOS)
158 KEYBOARD_BRIGHTNESS_DOWN,
159 KEYBOARD_BRIGHTNESS_UP,
156 NEXT_IME, 160 NEXT_IME,
157 PREVIOUS_IME, 161 PREVIOUS_IME,
158 SWITCH_IME, // Switch to another IME depending on the accelerator. 162 SWITCH_IME, // Switch to another IME depending on the accelerator.
159 TAKE_SCREENSHOT, 163 TAKE_SCREENSHOT,
160 TAKE_PARTIAL_SCREENSHOT, 164 TAKE_PARTIAL_SCREENSHOT,
161 TOGGLE_CAPS_LOCK, 165 TOGGLE_CAPS_LOCK,
162 TOGGLE_SPOKEN_FEEDBACK, 166 TOGGLE_SPOKEN_FEEDBACK,
163 VOLUME_DOWN, 167 VOLUME_DOWN,
164 VOLUME_MUTE, 168 VOLUME_MUTE,
165 VOLUME_UP, 169 VOLUME_UP,
166 ROTATE_WINDOWS, 170 ROTATE_WINDOWS,
167 #if !defined(NDEBUG) 171 #if !defined(NDEBUG)
168 PRINT_LAYER_HIERARCHY, 172 PRINT_LAYER_HIERARCHY,
169 PRINT_WINDOW_HIERARCHY, 173 PRINT_WINDOW_HIERARCHY,
170 ROTATE_SCREEN, 174 ROTATE_SCREEN,
171 #endif 175 #endif
172 }; 176 };
173 177
174 const size_t kActionsAllowedAtLoginOrLockScreenLength = 178 const size_t kActionsAllowedAtLoginOrLockScreenLength =
175 arraysize(kActionsAllowedAtLoginOrLockScreen); 179 arraysize(kActionsAllowedAtLoginOrLockScreen);
176 180
177 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 181 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
178 EXIT, 182 EXIT,
179 }; 183 };
180 184
181 const size_t kActionsAllowedAtLockScreenLength = 185 const size_t kActionsAllowedAtLockScreenLength =
182 arraysize(kActionsAllowedAtLockScreen); 186 arraysize(kActionsAllowedAtLockScreen);
183 187
184 } // namespace ash 188 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698