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

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

Issue 10824142: Support toggling Wi-Fi with keyboard shortcut. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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_strings.grd » ('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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN }, 87 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN },
88 { true, ui::VKEY_F6, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN }, 88 { true, ui::VKEY_F6, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN },
89 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP }, 89 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP },
90 { true, ui::VKEY_F7, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP }, 90 { true, ui::VKEY_F7, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP },
91 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE }, 91 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE },
92 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 92 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
93 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN }, 93 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN },
94 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 94 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
95 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, 95 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP },
96 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, 96 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
97 { true, ui::VKEY_F11, ui::EF_NONE, TOGGLE_WIFI },
Daniel Erat 2012/08/02 04:33:14 Is this in the wrong array? Shouldn't it be in kD
mazda 2012/08/02 05:44:13 Oops. Moved it to kDebugAcceleratorData. I chose F
97 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, 98 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER },
98 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY }, 99 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY },
99 { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, 100 { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
100 { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT}, 101 { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT},
101 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 102 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
102 SHOW_KEYBOARD_OVERLAY }, 103 SHOW_KEYBOARD_OVERLAY },
103 { true, ui::VKEY_OEM_2, 104 { true, ui::VKEY_OEM_2,
104 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 105 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
105 SHOW_KEYBOARD_OVERLAY }, 106 SHOW_KEYBOARD_OVERLAY },
106 { true, ui::VKEY_F1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK }, 107 { true, ui::VKEY_F1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK },
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 #endif // defined(OS_CHROMEOS) 198 #endif // defined(OS_CHROMEOS)
198 KEYBOARD_BRIGHTNESS_DOWN, 199 KEYBOARD_BRIGHTNESS_DOWN,
199 KEYBOARD_BRIGHTNESS_UP, 200 KEYBOARD_BRIGHTNESS_UP,
200 NEXT_IME, 201 NEXT_IME,
201 PREVIOUS_IME, 202 PREVIOUS_IME,
202 SWITCH_IME, // Switch to another IME depending on the accelerator. 203 SWITCH_IME, // Switch to another IME depending on the accelerator.
203 TAKE_SCREENSHOT, 204 TAKE_SCREENSHOT,
204 TAKE_PARTIAL_SCREENSHOT, 205 TAKE_PARTIAL_SCREENSHOT,
205 TOGGLE_CAPS_LOCK, 206 TOGGLE_CAPS_LOCK,
206 TOGGLE_SPOKEN_FEEDBACK, 207 TOGGLE_SPOKEN_FEEDBACK,
208 TOGGLE_WIFI,
207 VOLUME_DOWN, 209 VOLUME_DOWN,
208 VOLUME_MUTE, 210 VOLUME_MUTE,
209 VOLUME_UP, 211 VOLUME_UP,
210 ROTATE_WINDOWS, 212 ROTATE_WINDOWS,
211 #if !defined(NDEBUG) 213 #if !defined(NDEBUG)
212 PRINT_LAYER_HIERARCHY, 214 PRINT_LAYER_HIERARCHY,
213 PRINT_VIEW_HIERARCHY, 215 PRINT_VIEW_HIERARCHY,
214 PRINT_WINDOW_HIERARCHY, 216 PRINT_WINDOW_HIERARCHY,
215 ROTATE_SCREEN, 217 ROTATE_SCREEN,
216 #endif 218 #endif
217 }; 219 };
218 220
219 const size_t kActionsAllowedAtLoginOrLockScreenLength = 221 const size_t kActionsAllowedAtLoginOrLockScreenLength =
220 arraysize(kActionsAllowedAtLoginOrLockScreen); 222 arraysize(kActionsAllowedAtLoginOrLockScreen);
221 223
222 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 224 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
223 EXIT, 225 EXIT,
224 }; 226 };
225 227
226 const size_t kActionsAllowedAtLockScreenLength = 228 const size_t kActionsAllowedAtLockScreenLength =
227 arraysize(kActionsAllowedAtLockScreen); 229 arraysize(kActionsAllowedAtLockScreen);
228 230
229 } // namespace ash 231 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/ash_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698