Revert of chromeos: Convert ash VPNDelegate interface to mojo

ash/common/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/common/system/chromeos/network/vpn_list_view.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/chromeos/network/network_icon.h"
 #include "ash/common/system/chromeos/network/network_icon_animation.h"
 #include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
 #include "ash/common/system/chromeos/network/network_list_delegate.h"
-#include "ash/common/system/chromeos/network/vpn_list.h"
+#include "ash/common/system/chromeos/network/vpn_delegate.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_menu_button.h"
-#include "ash/common/system/tray/system_tray_controller.h"
+#include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/system/tray/tri_view.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 282 matching lines @@
     SetLayoutManager(layout);
     layout->SetDefaultFlex(0);
     layout->SetFlexForView(text_label(), 1);
   }
   Layout();
 }
 
 }  // namespace
 
 VPNListView::VPNListView(NetworkListDelegate* delegate) : delegate_(delegate) {
-  WmShell::Get()->vpn_list()->AddObserver(this);
+  WmShell::Get()->system_tray_delegate()->GetVPNDelegate()->AddObserver(this);
 }
 
 VPNListView::~VPNListView() {
-  WmShell::Get()->vpn_list()->RemoveObserver(this);
+  // We need the check as on shell destruction, the delegate is destroyed first.
+  SystemTrayDelegate* const 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.
   std::unique_ptr<VPNProvider> hovered_provider;
   std::string hovered_network_service_path;
   for (const std::pair<const views::View* const, VPNProvider>& provider :
        provider_view_map_) {
     if (static_cast<const HoverHighlightView*>(provider.first)->hover()) {
@@ skipping 81 matching lines @@
 void VPNListView::OnVPNProvidersChanged() {
   Update();
 }
 
 void VPNListView::OnViewClicked(views::View* sender) {
   const auto& provider_iter = provider_view_map_.find(sender);
   if (provider_iter != provider_view_map_.end()) {
     // If the user clicks on a provider entry, request that the "add network"
     // dialog for this provider be shown.
     const VPNProvider& provider = provider_iter->second;
-    WmShell* shell = WmShell::Get();
-    if (provider.third_party) {
-      shell->RecordUserMetricsAction(
-          UMA_STATUS_AREA_VPN_ADD_THIRD_PARTY_CLICKED);
-      shell->system_tray_controller()->ShowThirdPartyVpnCreate(
-          provider.extension_id);
-    } else {
-      shell->RecordUserMetricsAction(UMA_STATUS_AREA_VPN_ADD_BUILT_IN_CLICKED);
-      shell->system_tray_controller()->ShowNetworkCreate(shill::kTypeVPN);
-    }
+    WmShell::Get()->RecordUserMetricsAction(
+        provider.third_party ? UMA_STATUS_AREA_VPN_ADD_THIRD_PARTY_CLICKED
+                             : UMA_STATUS_AREA_VPN_ADD_BUILT_IN_CLICKED);
+    WmShell::Get()->system_tray_delegate()->GetVPNDelegate()->ShowAddPage(
+        provider.extension_id);
     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_->OnNetworkEntryClicked(sender);
 }
 
 void VPNListView::AddNetwork(const chromeos::NetworkState* network) {
@@ skipping 35 matching lines @@
   for (const chromeos::NetworkState* const& network : networks) {
     if (VpnProviderMatchesNetwork(vpn_provider, *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 =
-      WmShell::Get()->vpn_list()->vpn_providers();
+      WmShell::Get()->system_tray_delegate()->GetVPNDelegate()->vpn_providers();
 
   // 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 (!VpnProviderMatchesNetwork(*provider, *network))
         continue;
       AddProviderAndNetworks(*provider, 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, networks);
 }
 
 }  // namespace ash