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

Side by Side Diff: ash/accelerators/accelerator_controller.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
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller.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_CONTROLLER_H_ 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
6 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ 6 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 scoped_ptr<ScreenshotDelegate> screenshot_delegate_; 108 scoped_ptr<ScreenshotDelegate> screenshot_delegate_;
109 109
110 // A map from accelerators to the AcceleratorAction values, which are used in 110 // A map from accelerators to the AcceleratorAction values, which are used in
111 // the implementation. 111 // the implementation.
112 std::map<ui::Accelerator, int> accelerators_; 112 std::map<ui::Accelerator, int> accelerators_;
113 113
114 // Actions allowed when the user is not signed in. 114 // Actions allowed when the user is not signed in.
115 std::set<int> actions_allowed_at_login_screen_; 115 std::set<int> actions_allowed_at_login_screen_;
116 // Actions allowed when the screen is locked. 116 // Actions allowed when the screen is locked.
117 std::set<int> actions_allowed_at_lock_screen_; 117 std::set<int> actions_allowed_at_lock_screen_;
118 // Actions allowed when a modal window is up.
119 std::set<int> actions_allowed_at_modal_window_;
118 // Reserved actions. See accelerator_table.h for details. 120 // Reserved actions. See accelerator_table.h for details.
119 std::set<int> reserved_actions_; 121 std::set<int> reserved_actions_;
120 122
121 // Used to suppress accelerator handling on key repeat. 123 // Used to suppress accelerator handling on key repeat.
122 bool toggle_maximized_suppressed_; 124 bool toggle_maximized_suppressed_;
123 bool cycle_backward_linear_suppressed_; 125 bool cycle_backward_linear_suppressed_;
124 bool cycle_forward_linear_suppressed_; 126 bool cycle_forward_linear_suppressed_;
125 bool cycle_backward_mru_suppressed_; 127 bool cycle_backward_mru_suppressed_;
126 bool cycle_forward_mru_suppressed_; 128 bool cycle_forward_mru_suppressed_;
127 129
128 DISALLOW_COPY_AND_ASSIGN(AcceleratorController); 130 DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
129 }; 131 };
130 132
131 } // namespace ash 133 } // namespace ash
132 134
133 #endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ 135 #endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698