Move even more from WmShell to Shell

ash/common/system/user/user_card_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_card_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
@@ skipping 288 matching lines @@
   layout->set_minimum_cross_axis_size(kTrayPopupItemMinHeight);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   // For active users, the left inset is provided by ActiveUserBorder, which
   // is necessary to make sure the ripple does not cover that part of the row.
   // For inactive users, we set the inset here and this causes the ripple to
   // extend all the way to the edges of the menu.
   if (!is_active_user())
     SetBorder(views::CreateEmptyBorder(0, kMenuExtraMarginFromLeftEdge, 0, 0));
 
-  WmShell::Get()->media_controller()->AddObserver(this);
+  Shell::Get()->media_controller()->AddObserver(this);
 
   if (login_status == LoginStatus::PUBLIC)
     AddPublicModeUserContent(max_width);
   else
     AddUserContent(layout, login_status);
 }
 
 UserCardView::~UserCardView() {
-  WmShell::Get()->media_controller()->RemoveObserver(this);
+  Shell::Get()->media_controller()->RemoveObserver(this);
 }
 
 void UserCardView::PaintChildren(const ui::PaintContext& context) {
   if (!is_active_user()) {
     ui::CompositingRecorder alpha(context, 0xFF / 2, true);
     View::PaintChildren(context);
   } else {
     View::PaintChildren(context);
   }
 }
@@ skipping 128 matching lines @@
         gfx::CreateVectorIcon(kSystemTrayRecordingIcon, gfx::kGoogleRed700));
     const int media_capture_width = kTrayPopupItemMinEndWidth;
     media_capture_icon_->SetBorder(views::CreateEmptyBorder(
         gfx::Insets(0, (media_capture_width -
                         media_capture_icon_->GetPreferredSize().width()) /
                            2)));
 
     media_capture_icon_->set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR);
     AddChildView(media_capture_icon_);
 
-    WmShell::Get()->media_controller()->RequestCaptureState();
+    Shell::Get()->media_controller()->RequestCaptureState();
   }
 }
 
 }  // namespace tray
 }  // namespace ash