mash: Migrate SessionStateDelegate access to WmShell.

ash/root_window_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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/aura/aura_layout_manager_adapter.h"
@@ skipping 279 matching lines @@
 
   void set_shelf(ShelfLayoutManager* shelf) { shelf_ = shelf; }
 
   // WorkspaceLayoutManagerDelegate:
   void UpdateShelfVisibility() override {
     if (shelf_)
       shelf_->UpdateVisibilityState();
   }
   void OnFullscreenStateChanged(bool is_fullscreen) override {
     if (shelf_) {
-      ash::Shell::GetInstance()->NotifyFullscreenStateChange(
+      Shell::GetInstance()->NotifyFullscreenStateChange(
           is_fullscreen, WmWindowAura::Get(root_window_));
     }
   }
 
  private:
   aura::Window* root_window_;
   ShelfLayoutManager* shelf_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerDelegateImpl);
 };
@@ skipping 103 matching lines @@
     return false;
 
   // Always allow events to fall through to the virtual keyboard even if
   // displaying a system modal dialog.
   if (IsVirtualKeyboardWindow(window))
     return true;
 
   aura::Window* blocking_container = nullptr;
 
   int modal_container_id = 0;
-  if (Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked()) {
+  if (WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked()) {
     blocking_container =
         GetContainer(kShellWindowId_LockScreenContainersContainer);
     modal_container_id = kShellWindowId_LockSystemModalContainer;
   } else {
     modal_container_id = kShellWindowId_SystemModalContainer;
   }
   aura::Window* modal_container = GetContainer(modal_container_id);
   SystemModalContainerLayoutManager* modal_layout_manager = nullptr;
   modal_layout_manager = static_cast<SystemModalContainerLayoutManager*>(
       modal_container->layout_manager());
@@ skipping 25 matching lines @@
     aura::Window* window_container = WmWindowAura::GetAuraWindow(
         wm::GetContainerForWindow(WmWindowAura::Get(window)));
     if (window_container &&
         window_container->id() >= kShellWindowId_LockScreenContainer) {
       modal_container = GetContainer(kShellWindowId_LockSystemModalContainer);
     } else {
       modal_container = GetContainer(kShellWindowId_SystemModalContainer);
     }
   } else {
     int modal_window_id =
-        Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked()
+        WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked()
             ? kShellWindowId_LockSystemModalContainer
             : kShellWindowId_SystemModalContainer;
     modal_container = GetContainer(modal_window_id);
   }
   return modal_container ? static_cast<SystemModalContainerLayoutManager*>(
                                modal_container->layout_manager())
                          : NULL;
 }
 
 aura::Window* RootWindowController::GetContainer(int container_id) {
@@ skipping 310 matching lines @@
 
   WmShell::Get()->AddShellObserver(this);
 
   root_window_controller_common_->root_window_layout()->OnWindowResized();
   if (root_window_type == PRIMARY) {
     shell->InitKeyboard();
   } else {
     ash_host_->AsWindowTreeHost()->Show();
 
     // Create a shelf if a user is already logged in.
-    if (shell->session_state_delegate()->NumberOfLoggedInUsers())
+    if (WmShell::Get()->GetSessionStateDelegate()->NumberOfLoggedInUsers())
       CreateShelf();
 
     // Notify shell observers about new root window.
     shell->OnRootWindowAdded(WmWindowAura::Get(root_window));
   }
 
 #if defined(OS_CHROMEOS)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshDisableTouchExplorationMode)) {
     touch_exploration_manager_.reset(new AshTouchExplorationManager(this));
@@ skipping 41 matching lines @@
   WmWindow* shelf_container =
       WmWindowAura::Get(GetContainer(kShellWindowId_ShelfContainer));
   WmWindow* status_container =
       WmWindowAura::Get(GetContainer(kShellWindowId_StatusContainer));
   shelf_widget_.reset(new ShelfWidget(shelf_container, status_container,
                                       wm_shelf_aura_.get(),
                                       workspace_controller()));
   workspace_layout_manager_delegate->set_shelf(
       shelf_widget_->shelf_layout_manager());
 
-  if (!Shell::GetInstance()
-           ->session_state_delegate()
+  if (!WmShell::Get()
+           ->GetSessionStateDelegate()
            ->IsActiveUserSessionStarted()) {
     // This window exists only to be a event target on login screen.
     // It does not have to handle events, nor be visible.
     mouse_event_target_.reset(new aura::Window(new EmptyWindowDelegate));
     mouse_event_target_->Init(ui::LAYER_NOT_DRAWN);
 
     aura::Window* lock_background_container =
         GetContainer(kShellWindowId_LockScreenBackgroundContainer);
     lock_background_container->AddChild(mouse_event_target_.get());
     mouse_event_target_->Show();
@@ skipping 102 matching lines @@
     aura::Window* primary_root_window = Shell::GetInstance()
                                             ->window_tree_host_manager()
                                             ->GetPrimaryRootWindow();
     return GetRootWindowSettings(primary_root_window)->controller;
   }
 
   return GetRootWindowSettings(root_window)->controller;
 }
 
 }  // namespace ash