Revert 194578 "Add ash SessionStateDelegate"

trunk/src/ash/wm/stacking_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 
 namespace ash {
@@ skipping 92 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, private:
 
 aura::Window* StackingController::GetSystemModalContainer(
     aura::RootWindow* root,
     aura::Window* window) const {
   DCHECK(IsSystemModal(window));
 
   // 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);
   }
 
   // Otherwise those that originate from LockScreen container and above are
   // placed in the screen lock modal container.
   aura::Window* lock_container =
       GetContainerById(root, internal::kShellWindowId_LockScreenContainer);
   int lock_container_id = lock_container->id();
   int window_container_id = window->transient_parent()->parent()->id();
@@ skipping 20 matching lines @@
     controller->SetAlwaysOnTopContainer(
         root_window->GetChildById(
             internal::kShellWindowId_AlwaysOnTopContainer));
     // RootWindow owns the AlwaysOnTopController object.
     root_window->SetProperty(internal::kAlwaysOnTopControllerKey, controller);
   }
   return controller;
 }
 
 }  // namespace ash