[ash-md] Adds Wi-Fi header row to system tray network detailed view

ui/chromeos/network/network_list.cc

 // Copyright 2014 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 "ui/chromeos/network/network_list.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 57 matching lines @@
       no_wifi_networks_view_(NULL),
       no_cellular_networks_view_(NULL) {
   CHECK(delegate_);
 }
 
 NetworkListView::~NetworkListView() {
   network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 }
 
 void NetworkListView::Update() {
-  CHECK(container_);
+  CHECK(container());
   NetworkStateHandler::NetworkStateList network_list;
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   handler->GetVisibleNetworkList(&network_list);
   UpdateNetworks(network_list);
   UpdateNetworkIcons();
   UpdateNetworkListInternal();
 }
 
 bool NetworkListView::IsNetworkEntry(views::View* view,
                                      std::string* service_path) const {
@@ skipping 36 matching lines @@
     bool prohibited_by_policy = IsProhibitedByPolicy(network);
     info->image =
         network_icon::GetImageForNetwork(network, network_icon::ICON_TYPE_LIST);
     info->label =
         network_icon::GetLabelForNetwork(network, network_icon::ICON_TYPE_LIST);
     info->highlight =
         network->IsConnectedState() || network->IsConnectingState();
     info->disable =
         (network->activation_state() == shill::kActivationStateActivating) ||
         prohibited_by_policy;
+    info->is_wifi = network->Matches(NetworkTypePattern::WiFi());
     if (prohibited_by_policy) {
       info->tooltip =
           l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_PROHIBITED);
     }
     if (!animating && network->IsConnectingState())
       animating = true;
   }
   if (animating)
     network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
   else
     network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 }
 
 void NetworkListView::UpdateNetworkListInternal() {
   SCOPED_NET_LOG_IF_SLOW();
   // Get the updated list entries
   network_map_.clear();
   std::set<std::string> new_service_paths;
   bool needs_relayout = UpdateNetworkListEntries(&new_service_paths);
 
   // Remove old children
   std::set<std::string> remove_service_paths;
   for (ServicePathMap::const_iterator it = service_path_map_.begin();
        it != service_path_map_.end();
        ++it) {
     if (new_service_paths.find(it->first) == new_service_paths.end()) {
       remove_service_paths.insert(it->first);
       network_map_.erase(it->second);
-      container_->RemoveChildView(it->second);
+      delete it->second;
       needs_relayout = true;
     }
   }
 
   for (std::set<std::string>::const_iterator remove_it =
            remove_service_paths.begin();
        remove_it != remove_service_paths.end();
        ++remove_it) {
     service_path_map_.erase(*remove_it);
   }
 
   if (needs_relayout)
     HandleRelayout();
 }
 
 void NetworkListView::HandleRelayout() {
   views::View* selected_view = NULL;
   for (auto& iter : service_path_map_) {
     if (delegate_->IsViewHovered(iter.second)) {
       selected_view = iter.second;
       break;
     }
   }
-  container_->SizeToPreferredSize();
+  container()->SizeToPreferredSize();
   delegate_->RelayoutScrollList();
   if (selected_view)
-    container_->ScrollRectToVisible(selected_view->bounds());
+    container()->ScrollRectToVisible(selected_view->bounds());
 }
 
 bool NetworkListView::UpdateNetworkListEntries(
     std::set<std::string>* new_service_paths) {
   bool needs_relayout = false;
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   // Insert child views
   int index = 0;
 
@@ skipping 55 matching lines @@
       continue;
     needs_relayout |= UpdateNetworkChild(index++, info.get());
     new_service_paths->insert(info->service_path);
   }
   *child_index = index;
   return needs_relayout;
 }
 
 bool NetworkListView::UpdateNetworkChild(int index, const NetworkInfo* info) {
   bool needs_relayout = false;
-  views::View* container = NULL;
+  views::View* network_view = NULL;

[oshima, 2016/10/05 20:20:11]

would you mind changing NULL -> nullptr in this file?

[varkha, 2016/10/05 21:53:16]

Done.

   ServicePathMap::const_iterator found =
       service_path_map_.find(info->service_path);
   if (found == service_path_map_.end()) {
-    container = delegate_->CreateViewForNetwork(*info);
-    container_->AddChildViewAt(container, index);
+    network_view = delegate_->CreateViewForNetwork(*info);
+    container()->AddChildViewAt(network_view, index);
     needs_relayout = true;
   } else {
-    container = found->second;
-    container->RemoveAllChildViews(true);
-    delegate_->UpdateViewForNetwork(container, *info);
-    container->Layout();
-    container->SchedulePaint();
-    needs_relayout = PlaceViewAtIndex(container, index);
+    network_view = found->second;
+    network_view->RemoveAllChildViews(true);
+    delegate_->UpdateViewForNetwork(network_view, *info);
+    network_view->Layout();
+    network_view->SchedulePaint();
+    needs_relayout = PlaceViewAtIndex(network_view, index);
   }
   if (info->disable)
-    container->SetEnabled(false);
-  network_map_[container] = info->service_path;
-  service_path_map_[info->service_path] = container;
+    network_view->SetEnabled(false);
+  network_map_[network_view] = info->service_path;
+  service_path_map_[info->service_path] = network_view;
   return needs_relayout;
 }
 
 bool NetworkListView::PlaceViewAtIndex(views::View* view, int index) {
-  if (container_->child_at(index) == view)
+  if (container()->child_at(index) == view)
     return false;
-  container_->ReorderChildView(view, index);
+  container()->ReorderChildView(view, index);
   return true;
 }
 
 bool NetworkListView::UpdateInfoLabel(int message_id,
                                       int index,
                                       views::Label** label) {
   CHECK(label);
   bool needs_relayout = false;
   if (message_id) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     base::string16 text = rb.GetLocalizedString(message_id);
     if (!*label) {
       *label = delegate_->CreateInfoLabel();
       (*label)->SetText(text);
-      container_->AddChildViewAt(*label, index);
+      container()->AddChildViewAt(*label, index);
       needs_relayout = true;
     } else {
       (*label)->SetText(text);
       needs_relayout = PlaceViewAtIndex(*label, index);
     }
   } else if (*label) {
-    container_->RemoveChildView(*label);
     delete *label;
     *label = NULL;
     needs_relayout = true;
   }
   return needs_relayout;
 }
 
 void NetworkListView::NetworkIconChanged() {
   Update();
 }
 
 }  // namespace ui