| Index: ui/chromeos/network/network_list.cc
|
| diff --git a/ui/chromeos/network/network_list.cc b/ui/chromeos/network/network_list.cc
|
| index 960cd8c932975ed8e26beb9254131f990d31863f..ba3d91a716f9393b8efeed2feb771da7f2186cf9 100644
|
| --- a/ui/chromeos/network/network_list.cc
|
| +++ b/ui/chromeos/network/network_list.cc
|
| @@ -132,6 +132,7 @@ void NetworkListView::UpdateNetworkIcons() {
|
| 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);
|
| @@ -160,7 +161,7 @@ void NetworkListView::UpdateNetworkListInternal() {
|
| 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;
|
| }
|
| }
|
| @@ -310,7 +311,6 @@ bool NetworkListView::UpdateInfoLabel(int message_id,
|
| needs_relayout = PlaceViewAtIndex(*label, index);
|
| }
|
| } else if (*label) {
|
| - container_->RemoveChildView(*label);
|
| delete *label;
|
| *label = NULL;
|
| needs_relayout = true;
|
|
|