Revert 194578 "Add ash SessionStateDelegate"

> Add ash SessionStateDelegate
> 
> This CL refactors the ShellDelegate by adding a SessionStateDelegate to
> which methods dealing with the session state can be moved. This cleans up
> the huge ShellDelegate interface and paves the way for further Chrome OS
> multiprofile work which will need to add several new methods related to
> the session state.
> 
> This CL is only the first step. Several other methods should also move to
> SessionStateDelegate but I do not want to overburden a single CL.
> 
> BUG=None
> TEST=Manual and browser/unit tests
> 
> TBR=sky (for c/b/idle_chromeos.cc and c/chrome_browser_ui.gypi)
> 
> Review URL: https://codereview.chromium.org/14295008

TBR=bartfab@google.com

Review URL: https://codereview.chromium.org/14200034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194589 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 6 deletions

diff --git a/ash/shell.h b/ash/shell.h
index e8089c1..e644d2a 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -82,7 +82,6 @@ class PowerButtonController;
 class RootWindowHostFactory;
 class ScreenAsh;
 class SessionStateController;
-class SessionStateDelegate;
 class ShellDelegate;
 class ShellObserver;
 class SystemTray;
@@ -218,6 +217,13 @@ class ASH_EXPORT Shell
   // 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;
 
@@ -328,10 +334,6 @@ class ASH_EXPORT Shell
     return caps_lock_delegate_.get();
   }
 
-  SessionStateDelegate* session_state_delegate() {
-    return session_state_delegate_.get();
-  }
-
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
@@ -501,7 +503,6 @@ class ASH_EXPORT Shell
   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_;