Move yet more from WmShell to Shell

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"
@@ skipping 32 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.
-  SessionController* controller = WmShell::Get()->session_controller();
+  SessionController* controller = Shell::Get()->session_controller();
   if (controller->IsUserSessionBlocked())
     return;
 
   // |user_index| must be in range (0, number_of_user). Note 0 is excluded
   // because it represents the active user and SwitchUser should not be called
   // for such case.
   DCHECK_GT(user_index, 0);
   DCHECK_LT(user_index, controller->NumberOfLoggedInUsers());
 
   MultiProfileUMA::RecordSwitchActiveUser(
       MultiProfileUMA::SWITCH_ACTIVE_USER_BY_TRAY);
   controller->SwitchActiveUser(
       controller->GetUserSession(user_index)->account_id);
 }
 
 bool IsMultiProfileSupportedAndUserActive() {
   return Shell::Get()->shell_delegate()->IsMultiProfilesEnabled() &&
-         !WmShell::Get()->session_controller()->IsUserSessionBlocked();
+         !Shell::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 263 matching lines @@
   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 AddUserSessionPolicy add_user_policy =
-      WmShell::Get()->session_controller()->GetAddUserPolicy();
+      Shell::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