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

Unified Diff: ash/wm/session_state_controller_impl.h

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/session_state_controller.cc ('k') | ash/wm/session_state_controller_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/session_state_controller_impl.h
diff --git a/ash/wm/session_state_controller_impl.h b/ash/wm/session_state_controller_impl.h
index cab27b312d35d301aebb77dc46c20e3eec58a178..79a5c2cc528af6f7c23dbbc0218eb0d84603c8ec 100644
--- a/ash/wm/session_state_controller_impl.h
+++ b/ash/wm/session_state_controller_impl.h
@@ -7,8 +7,8 @@
#include "ash/ash_export.h"
#include "ash/shell_observer.h"
+#include "ash/wm/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"
@@ -32,7 +32,8 @@ class PowerButtonControllerTest;
// Displays onscreen animations and locks or suspends the system in response to
// the power button being pressed or released.
-class ASH_EXPORT SessionStateControllerImpl : public SessionStateController {
+class ASH_EXPORT SessionStateControllerImpl :
+ public LockStateController {
public:
// Helper class used by tests to access internal state.
@@ -96,7 +97,7 @@ class ASH_EXPORT SessionStateControllerImpl : 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;
« no previous file with comments | « ash/wm/session_state_controller.cc ('k') | ash/wm/session_state_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698