[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 114 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);
   }
@@ skipping 129 matching lines @@
     if (!*label) {
       *label = delegate_->CreateInfoLabel();
       (*label)->SetText(text);
       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