Revert 194589 "Revert 194578 "Add ash SessionStateDelegate""

trunk/src/ash/shell.h

Index: trunk/src/ash/shell.h
===================================================================
--- trunk/src/ash/shell.h	(revision 194598)
+++ trunk/src/ash/shell.h	(working copy)
@@ -82,6 +82,7 @@
 class RootWindowHostFactory;
 class ScreenAsh;
 class SessionStateController;
+class SessionStateDelegate;
 class ShellDelegate;
 class ShellObserver;
 class SystemTray;
@@ -217,13 +218,6 @@
   // Returns app list window or NULL if it is not visible.
   aura::Window* GetAppListWindow();
 
-  // Returns true if a user is logged in whose session can be locked (i.e. the
-  // user has a password with which to unlock the session).
-  bool CanLockScreen();
-
-  // Returns true if the screen is locked.
-  bool IsScreenLocked() const;
-
   // Returns true if a system-modal dialog window is currently open.
   bool IsSystemModalWindowOpen() const;
 
@@ -334,6 +328,10 @@
     return caps_lock_delegate_.get();
   }
 
+  SessionStateDelegate* session_state_delegate() {
+    return session_state_delegate_.get();
+  }
+
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
@@ -503,6 +501,7 @@
   scoped_ptr<SystemTrayNotifier> system_tray_notifier_;
   scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
   scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
+  scoped_ptr<SessionStateDelegate> session_state_delegate_;
   scoped_ptr<LauncherDelegate> launcher_delegate_;
 
   scoped_ptr<LauncherModel> launcher_model_;