Move yet more from WmShell to Shell

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/session/session_controller.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"
@@ skipping 64 matching lines @@
 
   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 SessionController* const session_controller =
-      WmShell::Get()->session_controller();
+      Shell::Get()->session_controller();
 
   // If the screen is locked or a system modal dialog box is shown, show only
   // the currently active user.
   if (user_index_ && (session_controller->IsUserSessionBlocked() ||
                       WmShell::Get()->IsSystemModalWindowOpen()))
     return nullptr;
 
   CHECK(user_ == nullptr);
 
   int logged_in_users = session_controller->NumberOfLoggedInUsers();
@@ skipping 121 matching lines @@
         views::BoxLayout::kVertical, 0, 0, kUserLabelToIconPadding));
   }
 }
 
 void TrayUser::OnUserUpdate() {
   UpdateAvatarImage(Shell::Get()->system_tray_delegate()->GetUserLoginStatus());
 }
 
 void TrayUser::OnUserAddedToSession() {
   const SessionController* const session_controller =
-      WmShell::Get()->session_controller();
+      Shell::Get()->session_controller();
   // Only create views for user items which are logged in.
   if (user_index_ >= session_controller->NumberOfLoggedInUsers())
     return;
 
   // Enforce a layout change that newly added items become visible.
   UpdateLayoutOfItem();
 
   // Update the user item.
   UpdateAvatarImage(Shell::Get()->system_tray_delegate()->GetUserLoginStatus());
 }
 
 void TrayUser::UpdateAvatarImage(LoginStatus status) {
   const SessionController* const session_controller =
-      WmShell::Get()->session_controller();
+      Shell::Get()->session_controller();
   if (!avatar_ || user_index_ >= session_controller->NumberOfLoggedInUsers())
     return;
 
   const mojom::UserSession* const user_session =
       session_controller->GetUserSession(user_index_);
   CHECK(user_session);
   // TODO(xiyuan); HiDpi avatar support. http://crbug.com/702689
   avatar_->SetImage(gfx::ImageSkia::CreateFrom1xBitmap(user_session->avatar),
                     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