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, 3 insertions, 4 deletions

diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index 3802440b..bbafab48 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -5,8 +5,8 @@
 #include "ash/wm/stacking_controller.h"
 
 #include "ash/display/display_controller.h"
-#include "ash/session_state_delegate.h"
 #include "ash/shell.h"
+#include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/coordinate_conversion.h"
@@ -119,9 +119,8 @@ aura::Window* StackingController::GetSystemModalContainer(
 
   // If screen lock is not active and user session is active,
   // all modal windows are placed into the normal modal container.
-  if (!Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
-      Shell::GetInstance()->session_state_delegate()->
-          IsActiveUserSessionStarted()) {
+  if (!Shell::GetInstance()->delegate()->IsScreenLocked() &&
+      Shell::GetInstance()->delegate()->IsSessionStarted()) {
     return GetContainerById(root,
                             internal::kShellWindowId_SystemModalContainer);
   }