mash: Move SystemTrayDelegate ownership to WmShell

ash/system/chromeos/network/vpn_list_view.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/system/chromeos/network/vpn_list_view.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/wm_shell.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/vpn_delegate.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/tray_popup_label_button.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 203 matching lines @@
   SetLayoutManager(layout);
   layout->SetDefaultFlex(0);
   layout->SetFlexForView(text_label(), 1);
   Layout();
 }
 
 }  // namespace
 
 VPNListView::VPNListView(ui::NetworkListDelegate* delegate)
     : delegate_(delegate) {
-  Shell::GetInstance()->system_tray_delegate()->GetVPNDelegate()->AddObserver(
-      this);
+  WmShell::Get()->system_tray_delegate()->GetVPNDelegate()->AddObserver(this);
 }
 
 VPNListView::~VPNListView() {
   // We need the check as on shell destruction, the delegate is destroyed first.
   SystemTrayDelegate* const system_tray_delegate =
-      Shell::GetInstance()->system_tray_delegate();
+      WmShell::Get()->system_tray_delegate();
   if (system_tray_delegate) {
     VPNDelegate* const vpn_delegate = system_tray_delegate->GetVPNDelegate();
     if (vpn_delegate)
       vpn_delegate->RemoveObserver(this);
   }
 }
 
 void VPNListView::Update() {
   // Before updating the list, determine whether the user was hovering over one
   // of the VPN provider or network entries.
@@ skipping 84 matching lines @@
 void VPNListView::OnVPNProvidersChanged() {
   Update();
 }
 
 void VPNListView::OnViewClicked(views::View* sender) {
   const auto& provider = provider_view_key_map_.find(sender);
   if (provider != provider_view_key_map_.end()) {
     // If the user clicks on a provider entry, request that the "add network"
     // dialog for this provider be shown.
     const VPNProvider::Key& key = provider->second;
-    Shell* shell = Shell::GetInstance();
-    shell->metrics()->RecordUserMetricsAction(
+    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
         key.third_party ? UMA_STATUS_AREA_VPN_ADD_THIRD_PARTY_CLICKED
                         : UMA_STATUS_AREA_VPN_ADD_BUILT_IN_CLICKED);
-    shell->system_tray_delegate()->GetVPNDelegate()->ShowAddPage(key);
+    WmShell::Get()->system_tray_delegate()->GetVPNDelegate()->ShowAddPage(key);
     return;
   }
 
   // If the user clicked on a network entry, let the |delegate_| trigger a
   // connection attempt (if the network is currently disconnected) or show a
   // configuration dialog (if the network is currently connected or connecting).
   delegate_->OnViewClicked(sender);
 }
 
 void VPNListView::AddNetwork(const chromeos::NetworkState* network) {
@@ skipping 24 matching lines @@
   // by shill.
   for (const chromeos::NetworkState* const& network : networks) {
     if (key.MatchesNetwork(*network))
       AddNetwork(network);
   }
 }
 
 void VPNListView::AddProvidersAndNetworks(
     const chromeos::NetworkStateHandler::NetworkStateList& networks) {
   // Get the list of VPN providers enabled in the primary user's profile.
-  std::vector<VPNProvider> providers = Shell::GetInstance()
+  std::vector<VPNProvider> providers = WmShell::Get()
                                            ->system_tray_delegate()
                                            ->GetVPNDelegate()
                                            ->GetVPNProviders();
 
   // Add providers with at least one configured network along with their
   // networks. Providers are added in the order of their highest priority
   // network.
   for (const chromeos::NetworkState* const& network : networks) {
     for (auto provider = providers.begin(); provider != providers.end();
          ++provider) {
       if (!provider->key.MatchesNetwork(*network))
         continue;
       AddProviderAndNetworks(provider->key, provider->name, networks);
       providers.erase(provider);
       break;
     }
   }
 
   // Add providers without any configured networks, in the order that the
   // providers were returned by the extensions system.
   for (const VPNProvider& provider : providers)
     AddProviderAndNetworks(provider.key, provider.name, networks);
 }
 
 }  // namespace ash