mash: Move //ash/session to //ash/common/session

ash/common/wm/container_finder.cc

 // Copyright 2016 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/common/wm/container_finder.h"
 
+#include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
@@ skipping 11 matching lines @@
          window->GetTransientParent()->GetType() != ui::wm::WINDOW_TYPE_UNKNOWN;
 }
 
 WmWindow* GetSystemModalContainer(WmWindow* root, WmWindow* window) {
   DCHECK(window->IsSystemModal());
 
   // If screen lock is not active and user session is active,
   // all modal windows are placed into the normal modal container.
   // In case of missing transient parent (it could happen for alerts from
   // background pages) assume that the window belongs to user session.
-  if (!window->GetShell()->IsUserSessionBlocked() ||
+  if (!window->GetShell()->GetSessionStateDelegate()->IsUserSessionBlocked() ||
       !window->GetTransientParent()) {
     return root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
   }
 
   // Otherwise those that originate from LockScreen container and above are
   // placed in the screen lock modal container.
   int window_container_id =
       window->GetTransientParent()->GetParent()->GetShellWindowId();
   if (window_container_id < kShellWindowId_LockScreenContainer)
     return root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
@@ skipping 52 matching lines @@
     default:
       NOTREACHED() << "Window " << window->GetShellWindowId()
                    << " has unhandled type " << window->GetType();
       break;
   }
   return nullptr;
 }
 
 }  // namespace wm
 }  // namespace ash