Rename SessionStateController -> LockStateController

ash/wm/session_lock_state_controller_impl2.h

Index: ash/wm/session_lock_state_controller_impl2.h
diff --git a/ash/wm/session_state_controller_impl2.h b/ash/wm/session_lock_state_controller_impl2.h
similarity index 89%
rename from ash/wm/session_state_controller_impl2.h
rename to ash/wm/session_lock_state_controller_impl2.h
index e40468ff2c640f78350b952899a996cfbd21b5af..e0ec777e0e64805e37e4e944d98830739a2d957d 100644
--- a/ash/wm/session_state_controller_impl2.h
+++ b/ash/wm/session_lock_state_controller_impl2.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_SESSION_STATE_CONTROLLER_IMPL2_H_
-#define ASH_WM_SESSION_STATE_CONTROLLER_IMPL2_H_
+#ifndef ASH_WM_SESSION_LOCK_STATE_CONTROLLER_IMPL2_H_
+#define ASH_WM_SESSION_LOCK_STATE_CONTROLLER_IMPL2_H_
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
+#include "ash/wm/session_lock_state_controller.h"
 #include "ash/wm/session_state_animator.h"
-#include "ash/wm/session_state_controller.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
@@ -27,7 +27,7 @@ class Layer;
 namespace ash {
 
 namespace test {
-class SessionStateControllerImpl2Test;
+class SessionLockStateControllerImpl2Test;
 }
 
 // Displays onscreen animations and locks or suspends the system in response to
@@ -54,13 +54,14 @@ class SessionStateControllerImpl2Test;
 // OnLockStateChanged is called. It leads to
 // StartUnlockAnimationAfterUIDestroyed.
 
-class ASH_EXPORT SessionStateControllerImpl2 : public SessionStateController {
+class ASH_EXPORT SessionLockStateControllerImpl2
+    : public SessionLockStateController {
  public:
 
   // Helper class used by tests to access internal state.
   class ASH_EXPORT TestApi {
    public:
-    explicit TestApi(SessionStateControllerImpl2* controller);
+    explicit TestApi(SessionLockStateControllerImpl2* controller);
 
     virtual ~TestApi();
 
@@ -100,13 +101,13 @@ class ASH_EXPORT SessionStateControllerImpl2 : public SessionStateController {
       controller_->real_shutdown_timer_.Stop();
     }
    private:
-    SessionStateControllerImpl2* controller_;  // not owned
+    SessionLockStateControllerImpl2* controller_;  // not owned
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
-  SessionStateControllerImpl2();
-  virtual ~SessionStateControllerImpl2();
+  SessionLockStateControllerImpl2();
+  virtual ~SessionLockStateControllerImpl2();
 
   // RootWindowObserver override:
   virtual void OnRootWindowHostCloseRequested(
@@ -117,7 +118,7 @@ class ASH_EXPORT SessionStateControllerImpl2 : public SessionStateController {
   virtual void OnAppTerminating() OVERRIDE;
   virtual void OnLockStateChanged(bool locked) OVERRIDE;
 
-  // SessionStateController overrides:
+  // SessionLockStateController overrides:
   virtual void StartLockAnimation(bool shutdown_after_lock) OVERRIDE;
 
   virtual void StartShutdownAnimation() OVERRIDE;
@@ -139,7 +140,7 @@ class ASH_EXPORT SessionStateControllerImpl2 : public SessionStateController {
   virtual void SetLockScreenDisplayedCallback(base::Closure& callback) OVERRIDE;
 
  protected:
-  friend class test::SessionStateControllerImpl2Test;
+  friend class test::SessionLockStateControllerImpl2Test;
 
  private:
   struct UnlockedStateProperties {
@@ -237,27 +238,27 @@ class ASH_EXPORT SessionStateControllerImpl2 : public SessionStateController {
 
   // Started when we request that the screen be locked.  When it fires, we
   // assume that our request got dropped.
-  base::OneShotTimer<SessionStateControllerImpl2> lock_fail_timer_;
+  base::OneShotTimer<SessionLockStateControllerImpl2> lock_fail_timer_;
 
   // Started when the screen is locked while the power button is held.  Adds a
   // delay between the appearance of the lock screen and the beginning of the
   // pre-shutdown animation.
-  base::OneShotTimer<SessionStateControllerImpl2> lock_to_shutdown_timer_;
+  base::OneShotTimer<SessionLockStateControllerImpl2> lock_to_shutdown_timer_;
 
   // Started when we begin displaying the pre-shutdown animation.  When it
   // fires, we start the shutdown animation and get ready to request shutdown.
-  base::OneShotTimer<SessionStateControllerImpl2> pre_shutdown_timer_;
+  base::OneShotTimer<SessionLockStateControllerImpl2> pre_shutdown_timer_;
 
   // Started when we display the shutdown animation.  When it fires, we actually
   // request shutdown.  Gives the animation time to complete before Chrome, X,
   // etc. are shut down.
-  base::OneShotTimer<SessionStateControllerImpl2> real_shutdown_timer_;
+  base::OneShotTimer<SessionLockStateControllerImpl2> real_shutdown_timer_;
 
   base::Closure lock_screen_displayed_callback_;
 
-  DISALLOW_COPY_AND_ASSIGN(SessionStateControllerImpl2);
+  DISALLOW_COPY_AND_ASSIGN(SessionLockStateControllerImpl2);
 };
 
 }  // namespace ash
 
-#endif  // ASH_WM_SESSION_STATE_CONTROLLER_IMPL2_H_
+#endif  // ASH_WM_SESSION_LOCK_STATE_CONTROLLER_IMPL2_H_