Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: ash/system/network/network_list.cc

Issue 2961153003: [CrOS Tether] NetworkList: Remove code which erroneously added Tether networks twice. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/network/network_list.cc
diff --git a/ash/system/network/network_list.cc b/ash/system/network/network_list.cc
index ea786f109ad55732256f3bb33693961bc7970e7e..1d75f994fa2a5d1c3bfd57bd73386006469337f8 100644
--- a/ash/system/network/network_list.cc
+++ b/ash/system/network/network_list.cc
@@ -318,16 +318,6 @@ void NetworkListView::UpdateNetworkList() {
NetworkStateHandler::NetworkStateList network_list;
handler->GetVisibleNetworkList(&network_list);
UpdateNetworks(network_list);
-
- // Add Tether networks.
- NetworkStateHandler::NetworkStateList tether_network_list;
- handler->GetVisibleNetworkListByType(NetworkTypePattern::Tether(),
- &tether_network_list);
- for (const auto* tether_network : tether_network_list) {
- network_list_.push_back(
- base::MakeUnique<NetworkInfo>(tether_network->guid()));
- }
-
UpdateNetworkIcons();
UpdateNetworkListInternal();
}
@@ -355,12 +345,6 @@ void NetworkListView::UpdateNetworks(
for (const auto* network : networks) {
if (!NetworkTypePattern::NonVirtual().MatchesType(network->type()))
continue;
-
- // Do not add Wi-Fi networks that are associated with a Tether network.
- if (NetworkTypePattern::WiFi().MatchesType(network->type()) &&
- !network->tether_guid().empty())
- continue;
-
network_list_.push_back(base::MakeUnique<NetworkInfo>(network->guid()));
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698