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

Side by Side Diff: ash/accelerators/accelerator_controller.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 | « 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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 scoped_ptr<BrightnessControlDelegate> brightness_control_delegate_; 96 scoped_ptr<BrightnessControlDelegate> brightness_control_delegate_;
97 scoped_ptr<CapsLockDelegate> caps_lock_delegate_; 97 scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
98 scoped_ptr<ImeControlDelegate> ime_control_delegate_; 98 scoped_ptr<ImeControlDelegate> ime_control_delegate_;
99 scoped_ptr<ScreenshotDelegate> screenshot_delegate_; 99 scoped_ptr<ScreenshotDelegate> screenshot_delegate_;
100 scoped_ptr<VolumeControlDelegate> volume_control_delegate_; 100 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;
101 101
102 // A map from accelerators to the AcceleratorAction values, which are used in 102 // A map from accelerators to the AcceleratorAction values, which are used in
103 // the implementation. 103 // the implementation.
104 std::map<ui::Accelerator, int> accelerators_; 104 std::map<ui::Accelerator, int> accelerators_;
105 105
106 // Actions allowed when the user is not signed in or screen is locked 106 // Actions allowed when the user is not signed in.
107 std::set<int> actions_allowed_at_login_screen_; 107 std::set<int> actions_allowed_at_login_screen_;
108 // Actions allowed when the screen is locked.
109 std::set<int> actions_allowed_at_lock_screen_;
108 110
109 DISALLOW_COPY_AND_ASSIGN(AcceleratorController); 111 DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
110 }; 112 };
111 113
112 } // namespace ash 114 } // namespace ash
113 115
114 #endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_ 116 #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