Remove NetworkListDelegate

ash/system/network/network_list.h

 // Copyright 2016 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.
 
 #ifndef ASH_SYSTEM_NETWORK_NETWORK_LIST_H_
 #define ASH_SYSTEM_NETWORK_NETWORK_LIST_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "ash/system/network/network_icon_animation_observer.h"
 #include "ash/system/network/network_info.h"
 #include "ash/system/network/network_list_view_base.h"
 #include "base/macros.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace views {
 class Label;
 class Separator;
 class View;
 }
 
 namespace ash {
-
+class HoverHighlightView;
 struct NetworkInfo;
-class NetworkListDelegate;
 class TriView;
 
 // A list of available networks of a given type. This class is used for all
 // network types except VPNs. For VPNs, see the |VPNList| class.
 class NetworkListView : public NetworkListViewBase,
                         public network_icon::AnimationObserver {
  public:
   class SectionHeaderRowView;
 
-  explicit NetworkListView(NetworkListDelegate* delegate);
+  explicit NetworkListView(tray::NetworkStateListDetailedView* detailed_view);
   ~NetworkListView() override;
 
   // NetworkListViewBase:
   void Update() override;
   bool IsNetworkEntry(views::View* view, std::string* guid) const override;
 
  private:
   // Clears |network_list_| and adds to it |networks| that match |delegate_|'s
   // network type pattern.
   void UpdateNetworks(
@@ skipping 13 matching lines @@
   void UpdateNetworkListInternal();
 
   // Adds new or updates existing child views including header row and messages.
   // Returns a set of guids for the added network connections.
   std::unique_ptr<std::set<std::string>> UpdateNetworkListEntries();
 
   // Creates the view which displays a warning message, if a VPN or proxy is
   // being used.
   TriView* CreateConnectionWarning();
 
+  // Creates and returns a View with the information in |info|.
+  HoverHighlightView* CreateViewForNetwork(const NetworkInfo& info);
+
+  // Updates |view| with the information in |info|. Note that |view| is
+  // guaranteed to be a View returned from |CreateViewForNetwork()|.
+  void UpdateViewForNetwork(HoverHighlightView* view, const NetworkInfo& info);
+
+  // Creates the view of an extra icon appearing next to the network name
+  // indicating that the network is controlled by an extension. If no extension
+  // is registered for this network, returns |nullptr|.
+  views::View* CreateControlledByExtensionView(const NetworkInfo& info);
+
   // Adds or updates child views representing the network connections when
   // |is_wifi| is matching the attribute of a network connection starting at
   // |child_index|. Returns a set of guids for the added network
   // connections.
   std::unique_ptr<std::set<std::string>> UpdateNetworkChildren(
       NetworkInfo::Type type,
       int child_index);
   void UpdateNetworkChild(int index, const NetworkInfo* info);
 
   // Reorders children of |container()| as necessary placing |view| at |index|.
@@ skipping 20 matching lines @@
                              views::Separator** separator_view);
 
   // network_icon::AnimationObserver:
   void NetworkIconChanged() override;
 
   // Returns true if the info should be updated to the view for network,
   // otherwise false.
   bool NeedUpdateViewForNetwork(const NetworkInfo& info) const;
 
   bool needs_relayout_;
-  NetworkListDelegate* delegate_;
 
   views::Label* no_wifi_networks_view_;
   views::Label* no_cellular_networks_view_;
   SectionHeaderRowView* cellular_header_view_;
   SectionHeaderRowView* tether_header_view_;
   SectionHeaderRowView* wifi_header_view_;
   views::Separator* cellular_separator_view_;
   views::Separator* tether_separator_view_;
   views::Separator* wifi_separator_view_;
   TriView* connection_warning_;
 
   // An owned list of network info.
   std::vector<std::unique_ptr<NetworkInfo>> network_list_;
 
   using NetworkMap = std::map<views::View*, std::string>;
   NetworkMap network_map_;
 
   // A map of network guids to their view.
-  using NetworkGuidMap = std::map<std::string, views::View*>;
+  using NetworkGuidMap = std::map<std::string, HoverHighlightView*>;
   NetworkGuidMap network_guid_map_;
 
   // Save a map of network guids to their infos against current |network_list_|.
   using NetworkInfoMap = std::map<std::string, std::unique_ptr<NetworkInfo>>;
   NetworkInfoMap last_network_info_map_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkListView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_NETWORK_NETWORK_LIST_H_