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

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

Issue 10977088: Fix for Ash shortcuts unexpectedly working in system model dialog (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: impl. of review comments 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
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/base/events/event_constants.h" 9 #include "ui/base/events/event_constants.h"
10 10
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // The number of elements in kActionsAllowedAtLoginOrLockScreen. 129 // The number of elements in kActionsAllowedAtLoginOrLockScreen.
130 ASH_EXPORT extern const size_t kActionsAllowedAtLoginOrLockScreenLength; 130 ASH_EXPORT extern const size_t kActionsAllowedAtLoginOrLockScreenLength;
131 131
132 // Actions allowed while screen is locked (in addition to 132 // Actions allowed while screen is locked (in addition to
133 // kActionsAllowedAtLoginOrLockScreen). 133 // kActionsAllowedAtLoginOrLockScreen).
134 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[]; 134 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[];
135 135
136 // The number of elements in kActionsAllowedAtLockScreen. 136 // The number of elements in kActionsAllowedAtLockScreen.
137 ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength; 137 ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength;
138 138
139 // Actions allowed while a modal window is up.
140 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtModalWindow[];
141
142 // The number of elements in kActionsAllowedAtModalWindow.
143 ASH_EXPORT extern const size_t kActionsAllowedAtModalWindowLength;
144
139 } // namespace ash 145 } // namespace ash
140 146
141 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ 147 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698