Index: ash/wm/lock_state_controller.cc |
diff --git a/ash/wm/session_state_controller.cc b/ash/wm/lock_state_controller.cc |
similarity index 50% |
rename from ash/wm/session_state_controller.cc |
rename to ash/wm/lock_state_controller.cc |
index 0bcf31d7f39ad56eaaaa4bf58d4c11e2c6234c97..5721b3049d23a4cae592410e5d84a00da01dccbf 100644 |
--- a/ash/wm/session_state_controller.cc |
+++ b/ash/wm/lock_state_controller.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "ash/wm/session_state_controller.h" |
+#include "ash/wm/lock_state_controller.h" |
#include "ash/ash_switches.h" |
#include "ash/shell.h" |
@@ -19,33 +19,32 @@ |
namespace ash { |
-const int SessionStateController::kLockTimeoutMs = 400; |
-const int SessionStateController::kShutdownTimeoutMs = 400; |
-const int SessionStateController::kLockFailTimeoutMs = 4000; |
-const int SessionStateController::kLockToShutdownTimeoutMs = 150; |
-const int SessionStateController::kShutdownRequestDelayMs = 50; |
+const int LockStateController::kLockTimeoutMs = 400; |
+const int LockStateController::kShutdownTimeoutMs = 400; |
+const int LockStateController::kLockFailTimeoutMs = 4000; |
+const int LockStateController::kLockToShutdownTimeoutMs = 150; |
+const int LockStateController::kShutdownRequestDelayMs = 50; |
-SessionStateController::SessionStateController() |
+LockStateController::LockStateController() |
: animator_(new internal::SessionStateAnimator()) { |
} |
-SessionStateController::~SessionStateController() { |
+LockStateController::~LockStateController() { |
} |
-void SessionStateController::SetDelegate( |
- SessionStateControllerDelegate* delegate) { |
+void LockStateController::SetDelegate(LockStateControllerDelegate* delegate) { |
delegate_.reset(delegate); |
} |
-void SessionStateController::AddObserver(SessionStateObserver* observer) { |
+void LockStateController::AddObserver(LockStateObserver* observer) { |
observers_.AddObserver(observer); |
} |
-void SessionStateController::RemoveObserver(SessionStateObserver* observer) { |
+void LockStateController::RemoveObserver(LockStateObserver* observer) { |
observers_.RemoveObserver(observer); |
} |
-bool SessionStateController::HasObserver(SessionStateObserver* observer) { |
+bool LockStateController::HasObserver(LockStateObserver* observer) { |
return observers_.HasObserver(observer); |
} |