Fix MediaClient::RequestCaptureState().

ash/common/system/user/tray_user.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/common/system/user/tray_user.h"
 
 #include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/session/session_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/system/user/rounded_image_view.h"
 #include "ash/common/system/user/user_view.h"
@@ skipping 56 matching lines @@
   CHECK(layout_view_ == nullptr);
 
   layout_view_ = new views::View;
   UpdateAfterLoginStatusChange(status);
   return layout_view_;
 }
 
 views::View* TrayUser::CreateDefaultView(LoginStatus status) {
   if (status == LoginStatus::NOT_LOGGED_IN)
     return nullptr;
-  const SessionStateDelegate* session_state_delegate =
-      WmShell::Get()->GetSessionStateDelegate();
+  const SessionController* session_controller =
+      WmShell::Get()->session_controller();

[xiyuan, 2017/01/09 21:21:47]

I have an incomplete CL (replace SessionStateDelegate with SessionController) to
do similar things in this file. Think this would break tests. The test mocks the
user and user sessions via TestSessionStateDelegate and SessionController does
not know anything about the mock. We might need to update relevant tests (in
tray_user_unittest.cc) as well.

 
   // If the screen is locked or a system modal dialog box is shown, show only
   // the currently active user.
-  if (user_index_ && (session_state_delegate->IsUserSessionBlocked() ||
+  if (user_index_ && (session_controller->IsUserSessionBlocked() ||
                       WmShell::Get()->IsSystemModalWindowOpen()))
     return nullptr;
 
   CHECK(user_ == nullptr);
 
-  int logged_in_users = session_state_delegate->NumberOfLoggedInUsers();
-
   // Do not show more UserView's then there are logged in users.
-  if (user_index_ >= logged_in_users)
+  if (user_index_ >= session_controller->NumberOfLoggedInUsers())
     return nullptr;
 
   user_ = new tray::UserView(this, status, user_index_);
   return user_;
 }
 
 void TrayUser::DestroyTrayView() {
   layout_view_ = nullptr;
   avatar_ = nullptr;
   label_ = nullptr;
@@ skipping 110 matching lines @@
         views::BoxLayout::kVertical, 0, 0, kUserLabelToIconPadding));
   }
 }
 
 void TrayUser::OnUserUpdate() {
   UpdateAvatarImage(
       WmShell::Get()->system_tray_delegate()->GetUserLoginStatus());
 }
 
 void TrayUser::OnUserAddedToSession() {
-  SessionStateDelegate* session_state_delegate =
-      WmShell::Get()->GetSessionStateDelegate();
   // Only create views for user items which are logged in.
-  if (user_index_ >= session_state_delegate->NumberOfLoggedInUsers())
+  if (user_index_ >=
+      WmShell::Get()->session_controller()->NumberOfLoggedInUsers()) {

[James Cook, 2017/01/09 21:07:19]

nit: line wrapping might be better here and below if you cached a
SessionController* in a local variable.

[riajiang, 2017/01/09 23:46:50]

Done.

     return;
+  }
 
   // Enforce a layout change that newly added items become visible.
   UpdateLayoutOfItem();
 
   // Update the user item.
   UpdateAvatarImage(
       WmShell::Get()->system_tray_delegate()->GetUserLoginStatus());
 }
 
 void TrayUser::UpdateAvatarImage(LoginStatus status) {
   SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
   if (!avatar_ ||
-      user_index_ >= session_state_delegate->NumberOfLoggedInUsers())
+      user_index_ >=
+          WmShell::Get()->session_controller()->NumberOfLoggedInUsers()) {
     return;
+  }
 
   const user_manager::UserInfo* user_info =
       session_state_delegate->GetUserInfo(user_index_);
   CHECK(user_info);
   avatar_->SetImage(user_info->GetImage(),
                     gfx::Size(kTrayItemSize, kTrayItemSize));
 
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
     avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize));
 }
 
 void TrayUser::UpdateLayoutOfItem() {
   UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());
 }
 
 }  // namespace ash