Merge NetworkListViewBase hierarchy and NetworkStateListDetailedView

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_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 "ash/system/tray/view_click_listener.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"
 #include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/text_constants.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
-
+namespace tray {
 namespace {
 
 // Indicates whether |network| belongs to this VPN provider.
 bool VpnProviderMatchesNetwork(const VPNProvider& provider,
                                const chromeos::NetworkState& network) {
   if (network.type() != shill::kTypeVPN)
     return false;
   const bool network_uses_third_party_provider =
       network.vpn_provider_type() == shill::kProviderThirdPartyVpn;
   if (!provider.third_party)
@@ skipping 172 matching lines @@
   AddIconAndLabels(
       image, text,
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTING));
   ThrobberView* throbber = new ThrobberView;
   throbber->Start();
   AddRightView(throbber);
 }
 
 }  // namespace
 
-VPNListView::VPNListView(tray::NetworkStateListDetailedView* detailed_view)
-    : NetworkListViewBase(detailed_view) {
+VPNListView::VPNListView(SystemTrayItem* owner, LoginStatus login)
+    : NetworkStateListDetailedView(owner, LIST_TYPE_VPN, login) {
   Shell::Get()->vpn_list()->AddObserver(this);
 }
 
 VPNListView::~VPNListView() {
   Shell::Get()->vpn_list()->RemoveObserver(this);
 }
 
-void VPNListView::Update() {
+void VPNListView::UpdateNetworkList() {
   // 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_guid;
   for (const std::pair<const views::View* const, VPNProvider>& provider :
        provider_view_map_) {
     if (provider.first->IsMouseHovered()) {
       hovered_provider.reset(new VPNProvider(provider.second));
       break;
     }
   }
   if (!hovered_provider) {
     for (const std::pair<const views::View*, std::string>& entry :
          network_view_guid_map_) {
       if (entry.first->IsMouseHovered()) {
         hovered_network_guid = entry.second;
         break;
       }
     }
   }
 
   // Clear the list.
-  container()->RemoveAllChildViews(true);
+  scroll_content()->RemoveAllChildViews(true);
   provider_view_map_.clear();
   network_view_guid_map_.clear();
   list_empty_ = true;
 
   // Get the list of available VPN networks, in shill's priority order.
   chromeos::NetworkStateHandler::NetworkStateList networks;
   chromeos::NetworkHandler::Get()
       ->network_state_handler()
       ->GetVisibleNetworkListByType(chromeos::NetworkTypePattern::VPN(),
                                     &networks);
@@ skipping 17 matching lines @@
     for (const std::pair<const views::View*, std::string>& entry :
          network_view_guid_map_) {
       if (entry.second == hovered_network_guid) {
         scroll_to_show_view = entry.first;
         break;
       }
     }
   }
 
   // Layout the updated list.
-  container()->SizeToPreferredSize();
-  detailed_view()->RelayoutScrollList();
+  scroll_content()->SizeToPreferredSize();
+  scroller()->Layout();
 
   if (scroll_to_show_view) {
     // Scroll the list so that |scroll_to_show_view| is in view.
-    container()->ScrollRectToVisible(scroll_to_show_view->bounds());
+    scroll_content()->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())
     return false;
   *guid = entry->second;
   return true;
 }
 
 void VPNListView::OnVPNProvidersChanged() {
-  Update();
+  UpdateNetworkList();
 }
 
 void VPNListView::AddNetwork(const chromeos::NetworkState* network) {
-  views::View* entry(new VPNListNetworkEntry(detailed_view(), network));
-  container()->AddChildView(entry);
+  views::View* entry(new VPNListNetworkEntry(this, network));
+  scroll_content()->AddChildView(entry);
   network_view_guid_map_[entry] = network->guid();
   list_empty_ = false;
 }
 
 void VPNListView::AddProviderAndNetworks(
     const VPNProvider& vpn_provider,
     const chromeos::NetworkStateHandler::NetworkStateList& networks) {
   // Add a visual separator, unless this is the topmost entry in the list.
-  if (!list_empty_)
-    container()->AddChildView(TrayPopupUtils::CreateListSubHeaderSeparator());
+  if (!list_empty_) {
+    scroll_content()->AddChildView(
+        TrayPopupUtils::CreateListSubHeaderSeparator());
+  }
   std::string vpn_name =
       vpn_provider.third_party
           ? vpn_provider.third_party_provider_name
           : l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_VPN_BUILT_IN_PROVIDER);
 
   // Add a list entry for the VPN provider.
   views::View* provider_view = nullptr;
   provider_view = new VPNListProviderEntry(vpn_provider, list_empty_, vpn_name,
                                            IDS_ASH_STATUS_TRAY_ADD_CONNECTION);
-  container()->AddChildView(provider_view);
+  scroll_content()->AddChildView(provider_view);
   provider_view_map_[provider_view] = vpn_provider;
   list_empty_ = false;
   // Add the networks belonging to this provider, in the priority order returned
   // by shill.
   for (const chromeos::NetworkState* const& network : networks) {
     if (VpnProviderMatchesNetwork(vpn_provider, *network))
       AddNetwork(network);
   }
 }
 
@@ skipping 16 matching lines @@
       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 tray
 }  // namespace ash