Merge NetworkListViewBase hierarchy and NetworkStateListDetailedView

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 "ash/system/network/network_state_list_detailed_view.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 TriView;
 
+namespace tray {
+
 // 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,
+class NetworkListView : public NetworkStateListDetailedView,
                         public network_icon::AnimationObserver {
  public:
   class SectionHeaderRowView;
 
-  explicit NetworkListView(tray::NetworkStateListDetailedView* detailed_view);
+  NetworkListView(SystemTrayItem* owner, LoginStatus login);
   ~NetworkListView() override;
 
-  // NetworkListViewBase:
-  void Update() override;
+  // NetworkStateListDetailedView:
+  void UpdateNetworkList() 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(
       const chromeos::NetworkStateHandler::NetworkStateList& networks);
 
   // Updates |network_list_| entries and sets |this| to observe network icon
   // animations when any of the networks are in connecting state.
@@ skipping 89 matching lines @@
   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 tray
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_NETWORK_NETWORK_LIST_H_