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

ash/aura/wm_shell_aura.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/aura/wm_shell_aura.h"
 
 #include "ash/aura/wm_window_aura.h"
+#include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/common/wm_overview_mode_observer.h"
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/wm/drag_window_resizer.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
@@ skipping 56 matching lines @@
   // http://crbug.com/617789.
   return Shell::GetInstance()
       ->mru_window_tracker()
       ->BuildWindowListIgnoreModal();
 }
 
 bool WmShellAura::IsForceMaximizeOnFirstRun() {
   return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun();
 }
 
-bool WmShellAura::IsUserSessionBlocked() {
-  return Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked();
-}
-
-bool WmShellAura::IsScreenLocked() {
-  return Shell::GetInstance()->session_state_delegate()->IsScreenLocked();
-}
-
 bool WmShellAura::CanShowWindowForUser(WmWindow* window) {
   return Shell::GetInstance()->delegate()->CanShowWindowForUser(
       WmWindowAura::GetAuraWindow(window));
 }
 
 void WmShellAura::LockCursor() {
   Shell::GetInstance()->cursor_manager()->LockCursor();
 }
 
 void WmShellAura::UnlockCursor() {
@@ skipping 26 matching lines @@
          window_selector_controller->IsSelecting();
 }
 
 bool WmShellAura::IsOverviewModeRestoringMinimizedWindows() {
   WindowSelectorController* window_selector_controller =
       Shell::GetInstance()->window_selector_controller();
   return window_selector_controller &&
          window_selector_controller->IsRestoringMinimizedWindows();
 }
 
+SessionStateDelegate* WmShellAura::GetSessionStateDelegate() {
+  return Shell::GetInstance()->session_state_delegate();
+}
+
 void WmShellAura::AddActivationObserver(WmActivationObserver* observer) {
   if (!added_activation_observer_) {
     added_activation_observer_ = true;
     Shell::GetInstance()->activation_client()->AddObserver(this);
   }
   activation_observers_.AddObserver(observer);
 }
 
 void WmShellAura::RemoveActivationObserver(WmActivationObserver* observer) {
   activation_observers_.RemoveObserver(observer);
@@ skipping 45 matching lines @@
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanged());
 }
 
 void WmShellAura::OnOverviewModeEnded() {
   FOR_EACH_OBSERVER(WmOverviewModeObserver, overview_mode_observers_,
                     OnOverviewModeEnded());
 }
 
 }  // namespace ash