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

Unified Diff: ash/common/system/chromeos/network/network_list_md.cc

Issue 2517953006: [ash-md] Adds Wi-Fi network status indicators in system menu (Closed)
Patch Set: [ash-md] Adds Wi-Fi network status indicators in system menu Created 4 years, 1 month 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
Index: ash/common/system/chromeos/network/network_list_md.cc
diff --git a/ash/common/system/chromeos/network/network_list_md.cc b/ash/common/system/chromeos/network/network_list_md.cc
index 1470a769a6e11b7ed93db60e6e6ba36e398679cb..19e4f39fc605f487185b1b17c984a408125d9cf0 100644
--- a/ash/common/system/chromeos/network/network_list_md.cc
+++ b/ash/common/system/chromeos/network/network_list_md.cc
@@ -298,8 +298,8 @@ void NetworkListViewMd::Update() {
NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
handler->GetVisibleNetworkList(&network_list);
UpdateNetworks(network_list);
- OrderNetworks();
UpdateNetworkIcons();
+ OrderNetworks();
UpdateNetworkListInternal();
}
@@ -338,6 +338,10 @@ void NetworkListViewMd::OrderNetworks() {
GetOrder(handler_->GetNetworkState(network2->service_path));
if (order1 != order2)
return order1 < order2;
+ if (network1->connected != network2->connected)
+ return network1->connected;
+ if (network1->connecting != network2->connecting)
+ return network1->connecting;
if (network1->highlight != network2->highlight)
return network1->highlight;
return network1->service_path.compare(network2->service_path) < 0;
@@ -384,8 +388,9 @@ void NetworkListViewMd::UpdateNetworkIcons() {
info->disable =
(network->activation_state() == shill::kActivationStateActivating) ||
prohibited_by_policy;
- info->highlight =
- network->IsConnectedState() || network->IsConnectingState();
+ info->connected = network->IsConnectedState();
+ info->connecting = network->IsConnectingState();
+ info->highlight = info->connected || info->connecting;
if (network->Matches(NetworkTypePattern::WiFi()))
info->type = NetworkInfo::Type::WIFI;
else if (network->Matches(NetworkTypePattern::Cellular()))

Powered by Google App Engine
This is Rietveld 408576698