Merge NetworkListViewBase hierarchy and NetworkStateListDetailedView

ash/system/network/network_list.cc

 // 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.
 
 #include "ash/system/network/network_list.h"
 
 #include <memory>
 
-#include "ash/public/cpp/config.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_info.h"
 #include "ash/system/network/network_state_list_detailed_view.h"
 #include "ash/system/networking_config_delegate.h"
-#include "ash/system/tray/fixed_sized_image_view.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/system_tray_delegate.h"
 #include "ash/system/tray/throbber_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
-#include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
-#include "chromeos/network/network_state_handler_observer.h"
 #include "chromeos/network/proxy/ui_proxy_config_service.h"
 #include "components/device_event_log/device_event_log.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/color_palette.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/toggle_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/separator.h"
-#include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
-#include "ui/views/painter.h"
+
 #include "ui/views/view.h"
 
 using chromeos::LoginState;
 using chromeos::NetworkHandler;
 using chromeos::NetworkStateHandler;
 using chromeos::ManagedNetworkConfigurationHandler;
 using chromeos::NetworkTypePattern;
 
 namespace ash {
-
+namespace tray {
 namespace {
 
 bool IsProhibitedByPolicy(const chromeos::NetworkState* network) {
   if (!NetworkTypePattern::WiFi().MatchesType(network->type()))
     return false;
   if (!LoginState::IsInitialized() || !LoginState::Get()->IsUserLoggedIn())
     return false;
   ManagedNetworkConfigurationHandler* managed_configuration_handler =
       NetworkHandler::Get()->managed_network_configuration_handler();
   const base::DictionaryValue* global_network_config =
@@ skipping 240 matching lines @@
   // A button to invoke "Join Wi-Fi network" dialog.
   SystemMenuButton* join_;
 
   DISALLOW_COPY_AND_ASSIGN(WifiHeaderRowView);
 };
 
 }  // namespace
 
 // NetworkListView:
 
-NetworkListView::NetworkListView(
-    tray::NetworkStateListDetailedView* detailed_view)
-    : NetworkListViewBase(detailed_view),
+NetworkListView::NetworkListView(SystemTrayItem* owner, LoginStatus login)
+    : NetworkStateListDetailedView(owner, LIST_TYPE_NETWORK, login),
       needs_relayout_(false),
       no_wifi_networks_view_(nullptr),
       no_cellular_networks_view_(nullptr),
       cellular_header_view_(nullptr),
       tether_header_view_(nullptr),
       wifi_header_view_(nullptr),
       cellular_separator_view_(nullptr),
       tether_separator_view_(nullptr),
       wifi_separator_view_(nullptr),
       connection_warning_(nullptr) {}
 
 NetworkListView::~NetworkListView() {
   network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 }
 
-void NetworkListView::Update() {
-  CHECK(container());
+void NetworkListView::UpdateNetworkList() {
+  CHECK(scroll_content());
 
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   NetworkStateHandler::NetworkStateList network_list;
   handler->GetVisibleNetworkList(&network_list);
   UpdateNetworks(network_list);
 
   // Add Tether networks.
   NetworkStateHandler::NetworkStateList tether_network_list;
   handler->GetVisibleNetworkListByType(NetworkTypePattern::Tether(),
@@ skipping 148 matching lines @@
   if (!needs_relayout_)
     return;
 
   views::View* selected_view = nullptr;
   for (const auto& iter : network_guid_map_) {
     if (iter.second->IsMouseHovered()) {
       selected_view = iter.second;
       break;
     }
   }
-  container()->SizeToPreferredSize();
-  detailed_view()->RelayoutScrollList();
+  scroll_content()->SizeToPreferredSize();
+  scroller()->Layout();
   if (selected_view)
-    container()->ScrollRectToVisible(selected_view->bounds());
+    scroll_content()->ScrollRectToVisible(selected_view->bounds());
 }
 
 std::unique_ptr<std::set<std::string>>
 NetworkListView::UpdateNetworkListEntries() {
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   // Keep an index where the next child should be inserted.
   int index = 0;
 
   // Show a warning that the connection might be monitored if connected to a VPN
@@ skipping 88 matching lines @@
   if (index == 0) {
     UpdateInfoLabel(IDS_ASH_STATUS_TRAY_NO_NETWORKS, index,
                     &no_wifi_networks_view_);
   }
 
   return new_guids;
 }
 
 HoverHighlightView* NetworkListView::CreateViewForNetwork(
     const NetworkInfo& info) {
-  HoverHighlightView* container = new HoverHighlightView(detailed_view());
+  HoverHighlightView* container = new HoverHighlightView(this);
   if (info.connected)
     SetupConnectedItem(container, info.label, info.image);
   else if (info.connecting)
     SetupConnectingItem(container, info.label, info.image);
   else
     container->AddIconAndLabel(info.image, info.label);
   container->SetTooltipText(info.tooltip);
   views::View* controlled_icon = CreateControlledByExtensionView(info);
   if (controlled_icon)
     container->AddRightView(controlled_icon);
   return container;
 }
 
 void NetworkListView::UpdateViewForNetwork(HoverHighlightView* view,
                                            const NetworkInfo& info) {
-  DCHECK(!view->has_children());
+  DCHECK(!view->is_populated());
   if (info.connected)
     SetupConnectedItem(view, info.label, info.image);
   else if (info.connecting)
     SetupConnectingItem(view, info.label, info.image);
   else
     view->AddIconAndLabel(info.image, info.label);
   views::View* controlled_icon = CreateControlledByExtensionView(info);
   view->SetTooltipText(info.tooltip);
   if (controlled_icon)
     view->AddChildView(controlled_icon);
@@ skipping 48 matching lines @@
     }
   }
   PlaceViewAtIndex(network_view, index);
   if (info->disable)
     network_view->SetEnabled(false);
   network_map_[network_view] = info->guid;
   network_guid_map_[info->guid] = network_view;
 }
 
 void NetworkListView::PlaceViewAtIndex(views::View* view, int index) {
-  if (view->parent() != container()) {
-    container()->AddChildViewAt(view, index);
+  if (view->parent() != scroll_content()) {
+    scroll_content()->AddChildViewAt(view, index);
   } else {
-    if (container()->child_at(index) == view)
+    if (scroll_content()->child_at(index) == view)
       return;
-    container()->ReorderChildView(view, index);
+    scroll_content()->ReorderChildView(view, index);
   }
   needs_relayout_ = true;
 }
 
 void NetworkListView::UpdateInfoLabel(int message_id,
                                       int insertion_index,
                                       views::Label** label_ptr) {
   views::Label* label = *label_ptr;
   if (!message_id) {
     if (label) {
       needs_relayout_ = true;
       delete label;
       *label_ptr = nullptr;
     }
     return;
   }
-  base::string16 text =
-      ui::ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
+  base::string16 text = l10n_util::GetStringUTF16(message_id);
   if (!label) {
     // TODO(mohsen): Update info label to follow MD specs. See
     // https://crbug.com/687778.
     label = new views::Label();
     label->SetBorder(views::CreateEmptyBorder(
         kTrayPopupPaddingBetweenItems, kTrayPopupPaddingHorizontal,
         kTrayPopupPaddingBetweenItems, 0));
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     label->SetEnabledColor(SkColorSetARGB(192, 0, 0, 0));
   }
@@ skipping 73 matching lines @@
       views::Background::CreateSolidBackground(SK_ColorTRANSPARENT));
   TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
   style.SetupLabel(label);
   connection_warning->AddView(TriView::Container::CENTER, label);
 
   // Nothing to the right of the text.
   connection_warning->SetContainerVisible(TriView::Container::END, false);
   return connection_warning;
 }
 
+}  // namespace tray
 }  // namespace ash