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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« 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