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

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

Issue 11047030: Decouple EventClientImpl and root window. Check containers on the same root window as focused windo… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 8 years, 2 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
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // F13 (which is also for locking screen) is handled directly in power 59 // F13 (which is also for locking screen) is handled directly in power
60 // manager. 60 // manager.
61 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, 61 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED },
62 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, 62 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED },
63 #if !defined(NDEBUG) 63 #if !defined(NDEBUG)
64 // Extra shortcut for debug build to activate lock screen on linux desktop. 64 // Extra shortcut for debug build to activate lock screen on linux desktop.
65 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, 65 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN },
66 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop. 66 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop.
67 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, 67 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
68 SWAP_PRIMARY_DISPLAY }, 68 SWAP_PRIMARY_DISPLAY },
69 // Extra shortcut to lock the screen on linux desktop.
70 { true, ui::VKEY_F11, ui::EF_NONE, POWER_PRESSED },
71 { false, ui::VKEY_F11, ui::EF_NONE, POWER_RELEASED },
69 #endif 72 #endif
70 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, 73 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG },
71 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, 74 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB },
72 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, 75 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
73 #endif 76 #endif
74 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, 77 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE },
75 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, 78 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
76 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 79 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
77 TOGGLE_SPOKEN_FEEDBACK }, 80 TOGGLE_SPOKEN_FEEDBACK },
78 81
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 arraysize(kActionsAllowedAtLoginOrLockScreen); 240 arraysize(kActionsAllowedAtLoginOrLockScreen);
238 241
239 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 242 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
240 EXIT, 243 EXIT,
241 }; 244 };
242 245
243 const size_t kActionsAllowedAtLockScreenLength = 246 const size_t kActionsAllowedAtLockScreenLength =
244 arraysize(kActionsAllowedAtLockScreen); 247 arraysize(kActionsAllowedAtLockScreen);
245 248
246 } // namespace ash 249 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698