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

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

Issue 10388230: Allow Control+Shift+Q on lock screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 8 years, 7 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_controller.cc ('k') | ash/accelerators/accelerator_table.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 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
6 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 6 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ui/aura/event.h" 10 #include "ui/aura/event.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 AcceleratorAction action; 78 AcceleratorAction action;
79 }; 79 };
80 80
81 // Accelerators handled by AcceleratorController. 81 // Accelerators handled by AcceleratorController.
82 ASH_EXPORT extern const AcceleratorData kAcceleratorData[]; 82 ASH_EXPORT extern const AcceleratorData kAcceleratorData[];
83 83
84 // The number of elements in kAcceleratorData. 84 // The number of elements in kAcceleratorData.
85 ASH_EXPORT extern const size_t kAcceleratorDataLength; 85 ASH_EXPORT extern const size_t kAcceleratorDataLength;
86 86
87 // Actions allowed while user is not signed in or screen is locked. 87 // Actions allowed while user is not signed in or screen is locked.
88 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLoginScreen[]; 88 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[];
89 89
90 // The number of elements in kActionsAllowedAtLoginScreen. 90 // The number of elements in kActionsAllowedAtLoginOrLockScreen.
91 ASH_EXPORT extern const size_t kActionsAllowedAtLoginScreenLength; 91 ASH_EXPORT extern const size_t kActionsAllowedAtLoginOrLockScreenLength;
92
93 // Actions allowed while screen is locked (in addition to
94 // kActionsAllowedAtLoginOrLockScreen).
95 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[];
96
97 // The number of elements in kActionsAllowedAtLockScreen.
98 ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength;
92 99
93 } // namespace ash 100 } // namespace ash
94 101
95 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 102 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698