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

Unified Diff: chrome/browser/resources/settings/internet_page/network_summary_item.js

Issue 2819253002: Internet: Show device enabling and scanning states (Closed)
Patch Set: Rebase Created 3 years, 8 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
Index: chrome/browser/resources/settings/internet_page/network_summary_item.js
diff --git a/chrome/browser/resources/settings/internet_page/network_summary_item.js b/chrome/browser/resources/settings/internet_page/network_summary_item.js
index 0e0b20431298b9ff95f8f6435fd2d166f33a139e..55fb84b127fbdcf30e024fb5ea168594234bccca 100644
--- a/chrome/browser/resources/settings/internet_page/network_summary_item.js
+++ b/chrome/browser/resources/settings/internet_page/network_summary_item.js
@@ -64,8 +64,19 @@ Polymer({
var name = CrOnc.getNetworkName(network);
if (state)
return this.getConnectionStateText_(state, name);
- if (this.deviceIsEnabled_(this.deviceState))
- return CrOncStrings.networkListItemNotConnected;
+ var deviceState = this.deviceState;
+ if (deviceState) {
+ if (deviceState.State ==
+ chrome.networkingPrivate.DeviceStateType.ENABLING) {
+ return this.i18n('internetDeviceEnabling');
+ }
+ if (deviceState.Type == CrOnc.Type.CELLULAR &&
+ this.deviceState.Scanning) {
+ return this.i18n('internetMobileSearching');
+ }
+ if (deviceState.State == chrome.networkingPrivate.DeviceStateType.ENABLED)
+ return CrOncStrings.networkListItemNotConnected;
+ }
return this.i18n('deviceOff');
},
@@ -193,7 +204,8 @@ Polymer({
* @private
*/
showDetailsIsVisible_: function() {
- return this.deviceIsEnabled_(this.deviceState);
+ return this.deviceIsEnabled_(this.deviceState) &&
+ (!!this.activeNetworkState.GUID || this.networkStateList.length > 0);
},
/**

Powered by Google App Engine
This is Rietveld 408576698