ash: Use SessionController instead of SessionStateDelegate

ash/common/system/user/user_view.cc

 // Copyright 2014 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/system/user/user_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/multi_profile_uma.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/system/user/button_from_view.h"
 #include "ash/common/system/user/login_status.h"
 #include "ash/common/system/user/rounded_image_view.h"
@@ skipping 21 matching lines @@
 #include "ui/views/painter.h"
 
 namespace ash {
 namespace tray {
 
 namespace {
 
 // Switch to a user with the given |user_index|.
 void SwitchUser(UserIndex user_index) {
   // Do not switch users when the log screen is presented.
-  SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
-  if (delegate->IsUserSessionBlocked())
+  SessionController* controller = WmShell::Get()->session_controller();
+  if (controller->IsUserSessionBlocked())
     return;
 
   DCHECK(user_index > 0);

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

nit: Also DCHECK less than session count

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

Done. And added comment of why 0 is excluded.

   MultiProfileUMA::RecordSwitchActiveUser(
       MultiProfileUMA::SWITCH_ACTIVE_USER_BY_TRAY);
-  delegate->SwitchActiveUser(delegate->GetUserInfo(user_index)->GetAccountId());
+  controller->SwitchActiveUser(
+      controller->GetUserSessions()[user_index]->account_id);
 }
 
 bool IsMultiProfileSupportedAndUserActive() {
   return Shell::Get()->shell_delegate()->IsMultiProfilesEnabled() &&
-         !WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked();
+         !WmShell::Get()->session_controller()->IsUserSessionBlocked();
 }
 
 // Creates the view shown in the user switcher popup ("AddUserMenuOption").
 views::View* CreateAddUserView(AddUserSessionPolicy policy,
                                views::ButtonListener* listener) {
   auto* view = new views::View;
   const int icon_padding = (kMenuButtonSize - kMenuIconSize) / 2;
   auto* layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
                            kTrayPopupLabelHorizontalPadding + icon_padding);
@@ skipping 262 matching lines @@
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.name = "AddUserMenuOption";
   WmWindow::Get(GetWidget()->GetNativeWindow())
       ->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           add_menu_option_.get(), kShellWindowId_DragImageAndTooltipContainer,
           &params);
   add_menu_option_->Init(params);
 
-  const SessionStateDelegate* delegate =
-      WmShell::Get()->GetSessionStateDelegate();
   const AddUserSessionPolicy add_user_policy =
-      delegate->GetAddUserSessionPolicy();
+      WmShell::Get()->session_controller()->GetAddUserPolicy();
   add_user_enabled_ = add_user_policy == AddUserSessionPolicy::ALLOWED;
 
   // Position the widget on top of the user card view (which is still in the
   // system menu). The top half of the widget will be transparent to allow
   // the active user to show through.
   gfx::Rect bounds = user_card_view_->GetBoundsInScreen();
   bounds.set_width(bounds.width() + kSeparatorWidth);
   int row_height = bounds.height();
 
   views::View* container = new AddUserWidgetContents(
@@ skipping 30 matching lines @@
     return;
   focus_manager_->RemoveFocusChangeListener(this);
   focus_manager_ = nullptr;
   if (user_card_view_->GetFocusManager())
     user_card_view_->GetFocusManager()->ClearFocus();
   add_menu_option_.reset();
 }
 
 }  // namespace tray
 }  // namespace ash