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

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

Issue 10825002: Separate debug shortcuts into another array in ash accelerator table. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 8 years, 5 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 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ui/aura/event.h" 9 #include "ui/aura/event.h"
10 10
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 int modifiers; 89 int modifiers;
90 AcceleratorAction action; 90 AcceleratorAction action;
91 }; 91 };
92 92
93 // Accelerators handled by AcceleratorController. 93 // Accelerators handled by AcceleratorController.
94 ASH_EXPORT extern const AcceleratorData kAcceleratorData[]; 94 ASH_EXPORT extern const AcceleratorData kAcceleratorData[];
95 95
96 // The number of elements in kAcceleratorData. 96 // The number of elements in kAcceleratorData.
97 ASH_EXPORT extern const size_t kAcceleratorDataLength; 97 ASH_EXPORT extern const size_t kAcceleratorDataLength;
98 98
99 // Debug accelerators enabled only when "Debugging keyboard shortcuts" flag
100 // (--ash-debug-shortcuts) is enabled.
101 ASH_EXPORT extern const AcceleratorData kDebugAcceleratorData[];
102
103 // The number of elements in kDebugAcceleratorData.
104 ASH_EXPORT extern const size_t kDebugAcceleratorDataLength;
105
99 // Actions that should be handled very early in Ash unless the current target 106 // Actions that should be handled very early in Ash unless the current target
100 // window is full-screen. 107 // window is full-screen.
101 ASH_EXPORT extern const AcceleratorAction kReservedActions[]; 108 ASH_EXPORT extern const AcceleratorAction kReservedActions[];
102 109
103 // The number of elements in kReservedActions. 110 // The number of elements in kReservedActions.
104 ASH_EXPORT extern const size_t kReservedActionsLength; 111 ASH_EXPORT extern const size_t kReservedActionsLength;
105 112
106 // Actions allowed while user is not signed in or screen is locked. 113 // Actions allowed while user is not signed in or screen is locked.
107 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[]; 114 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[];
108 115
109 // The number of elements in kActionsAllowedAtLoginOrLockScreen. 116 // The number of elements in kActionsAllowedAtLoginOrLockScreen.
110 ASH_EXPORT extern const size_t kActionsAllowedAtLoginOrLockScreenLength; 117 ASH_EXPORT extern const size_t kActionsAllowedAtLoginOrLockScreenLength;
111 118
112 // Actions allowed while screen is locked (in addition to 119 // Actions allowed while screen is locked (in addition to
113 // kActionsAllowedAtLoginOrLockScreen). 120 // kActionsAllowedAtLoginOrLockScreen).
114 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[]; 121 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[];
115 122
116 // The number of elements in kActionsAllowedAtLockScreen. 123 // The number of elements in kActionsAllowedAtLockScreen.
117 ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength; 124 ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength;
118 125
119 } // namespace ash 126 } // namespace ash
120 127
121 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 128 #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