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

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

Issue 10907084: ash: Prevent power button events from reaching apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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') | 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/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 28 matching lines...) Expand all
39 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, 39 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
40 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, 40 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI }, 42 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI },
43 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, 43 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN },
44 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, 44 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP },
45 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, 45 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN },
46 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, 46 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP },
47 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, 47 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE },
48 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, 48 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN },
49 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED },
50 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED },
49 #if !defined(NDEBUG) 51 #if !defined(NDEBUG)
50 // Extra shortcut for debug build to activate lock screen on linux desktop. 52 // Extra shortcut for debug build to activate lock screen on linux desktop.
51 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, 53 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN },
52 #endif 54 #endif
53 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, 55 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG },
54 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, 56 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB },
55 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, 57 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
56 #endif 58 #endif
57 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, 59 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE },
58 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, 60 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 TAKE_SCREENSHOT, // Control+F5 180 TAKE_SCREENSHOT, // Control+F5
179 TAKE_PARTIAL_SCREENSHOT, // Shift+Control+F5 181 TAKE_PARTIAL_SCREENSHOT, // Shift+Control+F5
180 BRIGHTNESS_DOWN, // F6 182 BRIGHTNESS_DOWN, // F6
181 KEYBOARD_BRIGHTNESS_DOWN, // Alt+F6 183 KEYBOARD_BRIGHTNESS_DOWN, // Alt+F6
182 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 184 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6
183 BRIGHTNESS_UP, // F7 185 BRIGHTNESS_UP, // F7
184 KEYBOARD_BRIGHTNESS_UP, // Alt+F7 186 KEYBOARD_BRIGHTNESS_UP, // Alt+F7
185 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 187 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7
186 VOLUME_MUTE, // F8 188 VOLUME_MUTE, // F8
187 VOLUME_DOWN, // F9 189 VOLUME_DOWN, // F9
188 VOLUME_UP // F10 190 VOLUME_UP, // F10
191 POWER_PRESSED,
192 POWER_RELEASED,
189 // TODO(yusukes): Handle F1, F2, F3, and F4 without modifiers in BrowserView. 193 // TODO(yusukes): Handle F1, F2, F3, and F4 without modifiers in BrowserView.
190 #endif 194 #endif
191 }; 195 };
192 196
193 const size_t kReservedActionsLength = arraysize(kReservedActions); 197 const size_t kReservedActionsLength = arraysize(kReservedActions);
194 198
195 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = { 199 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
196 BRIGHTNESS_DOWN, 200 BRIGHTNESS_DOWN,
197 BRIGHTNESS_UP, 201 BRIGHTNESS_UP,
198 #if defined(OS_CHROMEOS) 202 #if defined(OS_CHROMEOS)
(...skipping 26 matching lines...) Expand all
225 arraysize(kActionsAllowedAtLoginOrLockScreen); 229 arraysize(kActionsAllowedAtLoginOrLockScreen);
226 230
227 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 231 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
228 EXIT, 232 EXIT,
229 }; 233 };
230 234
231 const size_t kActionsAllowedAtLockScreenLength = 235 const size_t kActionsAllowedAtLockScreenLength =
232 arraysize(kActionsAllowedAtLockScreen); 236 arraysize(kActionsAllowedAtLockScreen);
233 237
234 } // namespace ash 238 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698