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

Unified Diff: ash/shell.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
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index b663f78c655bbb0f8dc02a28768c85490c7a761c..48e15e3edeca67759e35d2408ba2d0226ebf67ed 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -84,7 +84,7 @@ class PartialMagnificationController;
class PowerButtonController;
class RootWindowHostFactory;
class ScreenAsh;
-class SessionStateController;
+class SessionLockStateController;
class SessionStateDelegate;
class ShellDelegate;
class ShellObserver;
@@ -309,8 +309,8 @@ class ASH_EXPORT Shell
PowerButtonController* power_button_controller() {
return power_button_controller_.get();
}
- SessionStateController* session_state_controller() {
- return session_state_controller_.get();
+ SessionLockStateController* session_lock_state_controller() {
+ return session_lock_state_controller_.get();
}
UserActivityDetector* user_activity_detector() {
return user_activity_detector_.get();
@@ -537,7 +537,7 @@ class ASH_EXPORT Shell
scoped_ptr<views::corewm::TooltipController> tooltip_controller_;
scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
scoped_ptr<PowerButtonController> power_button_controller_;
- scoped_ptr<SessionStateController> session_state_controller_;
+ scoped_ptr<SessionLockStateController> session_lock_state_controller_;
scoped_ptr<UserActivityDetector> user_activity_detector_;
scoped_ptr<VideoDetector> video_detector_;
scoped_ptr<WindowCycleController> window_cycle_controller_;

Powered by Google App Engine
This is Rietveld 408576698