Move more from WmShell to Shell

ash/common/system/chromeos/cast/tray_cast.cc

 // Copyright 2015 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/chromeos/cast/tray_cast.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 110 matching lines @@
           nullptr,
           l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_CAST_CAST_UNKNOWN),
           l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_CAST_STOP)) {
   icon()->SetImage(
       gfx::CreateVectorIcon(kSystemMenuCastEnabledIcon, kMenuIconColor));
 }
 
 CastCastView::~CastCastView() {}
 
 void CastCastView::StopCasting() {
-  WmShell::Get()->cast_config()->StopCasting(displayed_route_.Clone());
+  Shell::Get()->cast_config()->StopCasting(displayed_route_.Clone());
   WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_CAST_STOP_CAST);
 }
 
 void CastCastView::UpdateLabel(
     const std::vector<mojom::SinkAndRoutePtr>& sinks_routes) {
   for (auto& i : sinks_routes) {
     const mojom::CastSinkPtr& sink = i->sink;
     const mojom::CastRoutePtr& route = i->route;
 
     // We only want to display casts that came from this machine, since on a
@@ skipping 266 matching lines @@
       kTrayPopupPaddingBetweenItems);
 
   scroll_content()->AddChildView(container);
   return container;
 }
 
 void CastDetailedView::HandleViewClicked(views::View* view) {
   // Find the receiver we are going to cast to.
   auto it = view_to_sink_map_.find(view);
   if (it != view_to_sink_map_.end()) {
-    WmShell::Get()->cast_config()->CastToSink(it->second.Clone());
+    Shell::Get()->cast_config()->CastToSink(it->second.Clone());
     WmShell::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_DETAILED_CAST_VIEW_LAUNCH_CAST);
   }
 }
 
 }  // namespace tray
 
 TrayCast::TrayCast(SystemTray* system_tray)
     : SystemTrayItem(system_tray, UMA_CAST) {
   Shell::GetInstance()->AddShellObserver(this);
-  WmShell::Get()->cast_config()->AddObserver(this);
-  WmShell::Get()->cast_config()->RequestDeviceRefresh();
+  Shell::Get()->cast_config()->AddObserver(this);
+  Shell::Get()->cast_config()->RequestDeviceRefresh();
 }
 
 TrayCast::~TrayCast() {
-  WmShell::Get()->cast_config()->RemoveObserver(this);
+  Shell::Get()->cast_config()->RemoveObserver(this);
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 void TrayCast::StartCastForTest(const std::string& receiver_id) {
   if (detailed_ != nullptr)
     detailed_->SimulateViewClickedForTest(receiver_id);
 }
 
 void TrayCast::StopCastForTest() {
   default_->cast_view()->StopCasting();
@@ skipping 53 matching lines @@
   if (default_) {
     bool has_receivers = !sinks_and_routes_.empty();
     default_->SetVisible(has_receivers);
     default_->cast_view()->UpdateLabel(sinks_and_routes_);
   }
   if (detailed_)
     detailed_->UpdateReceiverList(sinks_and_routes_);
 }
 
 void TrayCast::UpdatePrimaryView() {
-  if (WmShell::Get()->cast_config()->Connected() &&
-      !sinks_and_routes_.empty()) {
+  if (Shell::Get()->cast_config()->Connected() && !sinks_and_routes_.empty()) {
     if (default_) {
       if (HasActiveRoute())
         default_->ActivateCastView();
       else
         default_->ActivateSelectView();
     }
 
     if (tray_)
       tray_->SetVisible(is_mirror_casting_);
   } else {
@@ skipping 12 matching lines @@
 
   return false;
 }
 
 void TrayCast::OnCastingSessionStartedOrStopped(bool started) {
   is_mirror_casting_ = started;
   UpdatePrimaryView();
 }
 
 }  // namespace ash