Remove NetworkListDelegate

ash/system/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/network/vpn_list_view.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "ash/ash_view_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/network/network_icon.h"
 #include "ash/system/network/network_icon_animation.h"
 #include "ash/system/network/network_icon_animation_observer.h"
-#include "ash/system/network/network_list_delegate.h"
+#include "ash/system/network/network_state_list_detailed_view.h"
 #include "ash/system/network/vpn_list.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/throbber_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 184 matching lines @@
     tri_view()->AddView(TriView::Container::END, disconnect_button_);
     tri_view()->SetContainerVisible(TriView::Container::END, true);
     tri_view()->SetContainerBorder(
         TriView::Container::END,
         views::CreateEmptyBorder(0, 0, 0, kTrayPopupButtonEndMargin));
   }
   Layout();
 }
 
 // TODO(varkha): Consolidate with a similar method in tray_bluetooth.cc.
 void VPNListNetworkEntry::SetupConnectedItem(const base::string16& text,

[tdanderson, 2017/04/28 16:36:20]

Any way to share this code with the SetupConnect{ed,ing}Item() code you have
moved from NSLDV into NLV in this CL? At the very least please reference
crbug.com/686924 in this TODO (ditto for line 234).

[mohsen, 2017/04/28 21:51:32]

I have more refactorings planned which make sharing this code easier. Added the
bug reference to the TODO.

                                              const gfx::ImageSkia& image) {
   AddIconAndLabels(
       image, text,
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTED));
   TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::CAPTION);
   style.set_color_style(TrayPopupItemStyle::ColorStyle::CONNECTED);
   style.SetupLabel(sub_text_label());
 }
 
 // TODO(varkha): Consolidate with a similar method in tray_bluetooth.cc.
 void VPNListNetworkEntry::SetupConnectingItem(const base::string16& text,
                                               const gfx::ImageSkia& image) {
   AddIconAndLabels(
       image, text,
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTING));
   ThrobberView* throbber = new ThrobberView;
   throbber->Start();
   AddRightView(throbber);
 }
 
 }  // namespace
 
-VPNListView::VPNListView(NetworkListDelegate* delegate) : delegate_(delegate) {
+VPNListView::VPNListView(tray::NetworkStateListDetailedView* detailed_view)
+    : NetworkListViewBase(detailed_view) {
   Shell::Get()->vpn_list()->AddObserver(this);
 }
 
 VPNListView::~VPNListView() {
   Shell::Get()->vpn_list()->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 49 matching lines @@
          network_view_guid_map_) {
       if (entry.second == hovered_network_guid) {
         scroll_to_show_view = entry.first;
         break;
       }
     }
   }
 
   // Layout the updated list.
   container()->SizeToPreferredSize();
-  delegate_->RelayoutScrollList();
+  detailed_view()->RelayoutScrollList();
 
   if (scroll_to_show_view) {
     // Scroll the list so that |scroll_to_show_view| is in view.
     container()->ScrollRectToVisible(scroll_to_show_view->bounds());
   }
 }
 
 bool VPNListView::IsNetworkEntry(views::View* view, std::string* guid) const {
   const auto& entry = network_view_guid_map_.find(view);
   if (entry == network_view_guid_map_.end())
@@ skipping 22 matching lines @@
           UMA_STATUS_AREA_VPN_ADD_BUILT_IN_CLICKED);
       Shell::Get()->system_tray_controller()->ShowNetworkCreate(
           shill::kTypeVPN);
     }
     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);
+  detailed_view()->OnNetworkEntryClicked(sender);
 }
 
 void VPNListView::AddNetwork(const chromeos::NetworkState* network) {
   views::View* entry(new VPNListNetworkEntry(this, network));
   container()->AddChildView(entry);
   network_view_guid_map_[entry] = network->guid();
   list_empty_ = false;
 }
 
 void VPNListView::AddProviderAndNetworks(
@@ skipping 42 matching lines @@
     }
   }
 
   // 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