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

Side by Side Diff: ash/wm/lock_state_controller.cc

Issue 15974008: Rename SessionStateController -> LockStateController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/wm/lock_state_controller.h ('k') | ash/wm/lock_state_controller_impl2.h » ('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 #include "ash/wm/session_state_controller.h" 5 #include "ash/wm/lock_state_controller.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_delegate.h" 9 #include "ash/shell_delegate.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
11 #include "ash/wm/session_state_animator.h" 11 #include "ash/wm/session_state_animator.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "ui/aura/root_window.h" 13 #include "ui/aura/root_window.h"
14 #include "ui/views/corewm/compound_event_filter.h" 14 #include "ui/views/corewm/compound_event_filter.h"
15 15
16 #if defined(OS_CHROMEOS) 16 #if defined(OS_CHROMEOS)
17 #include "base/chromeos/chromeos_version.h" 17 #include "base/chromeos/chromeos_version.h"
18 #endif 18 #endif
19 19
20 namespace ash { 20 namespace ash {
21 21
22 const int SessionStateController::kLockTimeoutMs = 400; 22 const int LockStateController::kLockTimeoutMs = 400;
23 const int SessionStateController::kShutdownTimeoutMs = 400; 23 const int LockStateController::kShutdownTimeoutMs = 400;
24 const int SessionStateController::kLockFailTimeoutMs = 4000; 24 const int LockStateController::kLockFailTimeoutMs = 4000;
25 const int SessionStateController::kLockToShutdownTimeoutMs = 150; 25 const int LockStateController::kLockToShutdownTimeoutMs = 150;
26 const int SessionStateController::kShutdownRequestDelayMs = 50; 26 const int LockStateController::kShutdownRequestDelayMs = 50;
27 27
28 SessionStateController::SessionStateController() 28 LockStateController::LockStateController()
29 : animator_(new internal::SessionStateAnimator()) { 29 : animator_(new internal::SessionStateAnimator()) {
30 } 30 }
31 31
32 SessionStateController::~SessionStateController() { 32 LockStateController::~LockStateController() {
33 } 33 }
34 34
35 void SessionStateController::SetDelegate( 35 void LockStateController::SetDelegate(LockStateControllerDelegate* delegate) {
36 SessionStateControllerDelegate* delegate) {
37 delegate_.reset(delegate); 36 delegate_.reset(delegate);
38 } 37 }
39 38
40 void SessionStateController::AddObserver(SessionStateObserver* observer) { 39 void LockStateController::AddObserver(LockStateObserver* observer) {
41 observers_.AddObserver(observer); 40 observers_.AddObserver(observer);
42 } 41 }
43 42
44 void SessionStateController::RemoveObserver(SessionStateObserver* observer) { 43 void LockStateController::RemoveObserver(LockStateObserver* observer) {
45 observers_.RemoveObserver(observer); 44 observers_.RemoveObserver(observer);
46 } 45 }
47 46
48 bool SessionStateController::HasObserver(SessionStateObserver* observer) { 47 bool LockStateController::HasObserver(LockStateObserver* observer) {
49 return observers_.HasObserver(observer); 48 return observers_.HasObserver(observer);
50 } 49 }
51 50
52 51
53 } // namespace ash 52 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/lock_state_controller.h ('k') | ash/wm/lock_state_controller_impl2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698