ash: Use SessionController instead of SessionStateDelegate

ash/common/wm_shell.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_shell.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/cast_config_controller.h"
@@ skipping 65 matching lines @@
   shelf_controller_.reset();
 }
 
 ShelfModel* WmShell::shelf_model() {
   return shelf_controller_->model();
 }
 
 void WmShell::ShowContextMenu(const gfx::Point& location_in_screen,
                               ui::MenuSourceType source_type) {
   // Bail if there is no active user session or if the screen is locked.
-  if (GetSessionStateDelegate()->NumberOfLoggedInUsers() < 1 ||
-      GetSessionStateDelegate()->IsScreenLocked()) {
+  if (session_controller()->NumberOfLoggedInUsers() < 1 ||
+      session_controller()->IsScreenLocked()) {
     return;
   }
 
   WmWindow* root = wm::GetRootWindowAt(location_in_screen);
   root->GetRootWindowController()->ShowContextMenu(location_in_screen,
                                                    source_type);
 }
 
 void WmShell::CreateShelfView() {
   // Must occur after SessionStateDelegate creation and user login.

[James Cook, 2017/03/17 17:14:36]

Is this comment still correct?

[xiyuan, 2017/03/17 22:52:02]

Removed. SessionStateDelegate is no longer relevant.

-  DCHECK(GetSessionStateDelegate());
-  DCHECK_GT(GetSessionStateDelegate()->NumberOfLoggedInUsers(), 0);
+  // Must occur after SessionController creation and user login.
+  DCHECK(session_controller());
+  DCHECK_GT(session_controller()->NumberOfLoggedInUsers(), 0);
   CreateShelfDelegate();
 
   for (WmWindow* root_window : GetAllRootWindows())
     root_window->GetRootWindowController()->CreateShelfView();
 }
 
 void WmShell::CreateShelfDelegate() {
   // May be called multiple times as shelves are created and destroyed.
   if (shelf_delegate_)
     return;
-  // Must occur after SessionStateDelegate creation and user login because
+  // Must occur after SessionController creation and user login because
   // Chrome's implementation of ShelfDelegate assumes it can get information
   // about multi-profile login state.
-  DCHECK(GetSessionStateDelegate());
-  DCHECK_GT(GetSessionStateDelegate()->NumberOfLoggedInUsers(), 0);
+  DCHECK(session_controller());
+  DCHECK_GT(session_controller()->NumberOfLoggedInUsers(), 0);
   shelf_delegate_.reset(
       Shell::Get()->shell_delegate()->CreateShelfDelegate(shelf_model()));
   shelf_window_watcher_.reset(new ShelfWindowWatcher(shelf_model()));
 }
 
 void WmShell::UpdateAfterLoginStatusChange(LoginStatus status) {
   for (WmWindow* root_window : GetAllRootWindows()) {
     root_window->GetRootWindowController()->UpdateAfterLoginStatusChange(
         status);
   }
@@ skipping 154 matching lines @@
 
   // Only trigger an update in mash because with classic ash chrome calls
   // UpdateAfterLoginStatusChange() directly.
   if (IsRunningInMash()) {
     // TODO(jamescook): Should this call Shell::OnLoginStatusChanged() too?
     UpdateAfterLoginStatusChange(session_controller_->GetLoginStatus());
   }
 }
 
 }  // namespace ash