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

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

Issue 10830346: Make KEY_WLAN toggle Wi-Fi enable/disable. (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 | « no previous file | ui/base/keycodes/keyboard_code_conversion_x.cc » ('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 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 24 matching lines...) Expand all
35 { true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME }, 35 { true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME },
36 // Shortcut for Koren IME. 36 // Shortcut for Koren IME.
37 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME }, 37 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME },
38 38
39 { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, 39 { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
40 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 40 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
41 CYCLE_BACKWARD_MRU }, 41 CYCLE_BACKWARD_MRU },
42 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, 42 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
43 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, 43 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
44 #if defined(OS_CHROMEOS) 44 #if defined(OS_CHROMEOS)
45 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI },
45 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, 46 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN },
46 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, 47 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP },
47 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, 48 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN },
48 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, 49 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP },
49 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, 50 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE },
50 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, 51 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN },
51 #if !defined(NDEBUG) 52 #if !defined(NDEBUG)
52 // Extra shortcut for debug build to activate lock screen on linux desktop. 53 // Extra shortcut for debug build to activate lock screen on linux desktop.
53 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, 54 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN },
54 #endif 55 #endif
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 arraysize(kActionsAllowedAtLoginOrLockScreen); 222 arraysize(kActionsAllowedAtLoginOrLockScreen);
222 223
223 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 224 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
224 EXIT, 225 EXIT,
225 }; 226 };
226 227
227 const size_t kActionsAllowedAtLockScreenLength = 228 const size_t kActionsAllowedAtLockScreenLength =
228 arraysize(kActionsAllowedAtLockScreen); 229 arraysize(kActionsAllowedAtLockScreen);
229 230
230 } // namespace ash 231 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ui/base/keycodes/keyboard_code_conversion_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698