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

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

Issue 2722373002: cros - Show progress bar in network detailed view when scanning for (Closed)
Patch Set: Created 3 years, 10 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/common/system/chromeos/network/network_state_list_detailed_view.cc
diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
index 224c07b5e20d9e8a969d32543d46fe2b3b9e0d23..482c071a4af7b5c8fa00dfbce8122e5f5dcc5763 100644
--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc
@@ -535,6 +535,16 @@ void NetworkStateListDetailedView::UpdateHeaderButtons() {
NetworkHandler::Get()->network_state_handler()->DefaultNetwork() !=
nullptr);
}
+
+ if (list_type_ != LIST_TYPE_VPN) {
+ bool scanning =
+ NetworkHandler::Get()->network_state_handler()->GetScanningByType(
tdanderson 2017/03/02 21:10:28 TrayNetworkStateObserver::DeviceListChanged()
tdanderson 2017/03/02 21:11:14 ^ Ignore this comment, sorry.
+ NetworkTypePattern::WiFi());
+ ShowProgress(-1, scanning);
+ info_button_md_->SetTooltipText(l10n_util::GetStringUTF16(
+ scanning ? IDS_ASH_STATUS_TRAY_WIFI_SCANNING_MESSAGE
tdanderson 2017/03/02 21:10:28 Is this really the right thing to do? I think the
Evan Stade 2017/03/02 22:16:39 this is what the pre-md code used to do before we
tdanderson 2017/03/03 16:41:18 I mis-typed. I meant to type "Searching for Wi-Fi
+ : IDS_ASH_STATUS_TRAY_NETWORK_INFO));
+ }
}
bool NetworkStateListDetailedView::OrderChild(views::View* view, int index) {
« 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