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

Unified Diff: ui/webui/resources/cr_elements/network/cr_network_icon.js

Issue 2290853002: MD Settings: Use network name for detail page title (Closed)
Patch Set: Rebase + use ordered array of types instead of sort Created 4 years, 4 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: ui/webui/resources/cr_elements/network/cr_network_icon.js
diff --git a/ui/webui/resources/cr_elements/network/cr_network_icon.js b/ui/webui/resources/cr_elements/network/cr_network_icon.js
index 13a3d6da9e09bade553ea8fbd0c51cc6682d8fec..b6662909ca0a7ec17e84d7025b52be7ede0fa7fc 100644
--- a/ui/webui/resources/cr_elements/network/cr_network_icon.js
+++ b/ui/webui/resources/cr_elements/network/cr_network_icon.js
@@ -59,17 +59,17 @@ Polymer({
*/
networkState: {
type: Object,
- observer: 'networkStateChanged_'
+ observer: 'networkStateChanged_',
},
/**
* If set, the ONC network type will be used to display the icon.
* @type {?chrome.networkingPrivate.NetworkType}
*/
- networkType: {
+ networkType: {
type: String,
value: null,
- observer: 'networkTypeChanged_'
+ observer: 'networkTypeChanged_',
},
/**
@@ -77,34 +77,34 @@ Polymer({
* differently, e.g. the disconnected image will never be shown for
* list items.
*/
- isListItem: {
+ isListItem: {
type: Boolean,
value: false,
- observer: 'isListItemChanged_'
+ observer: 'isListItemChanged_',
},
/** The icon type to use for the base image of the icon. */
iconType_: {
type: String,
- value: 'ethernet'
+ value: 'ethernet',
},
/** Set to true to show a badge for roaming networks. */
roaming_: {
type: Boolean,
- value: false
+ value: false,
},
/** Set to true to show a badge for secure networks. */
secure_: {
type: Boolean,
- value: false
+ value: false,
},
/** Set to the name of a technology to show show a badge. */
technology_: {
type: String,
- value: ''
+ value: '',
},
},
@@ -193,6 +193,10 @@ Polymer({
} else {
icon.classList.toggle('multi-level', multiLevel);
icon.classList.toggle('level0', multiLevel);
+ icon.classList.toggle('level1', false);
+ icon.classList.toggle('level2', false);
+ icon.classList.toggle('level3', false);
+ icon.classList.toggle('level4', false);
}
this.setIconBadges_(params);
@@ -214,8 +218,9 @@ Polymer({
if (connectionState == CrOnc.ConnectionState.CONNECTING) {
strength = 0;
connecting = true;
- } else if (connectionState == CrOnc.ConnectionState.CONNECTED ||
- !params.showDisconnected) {
+ } else if (
+ connectionState == CrOnc.ConnectionState.CONNECTED ||
+ !params.showDisconnected) {
strength = params.strength || 0;
}
@@ -237,8 +242,7 @@ Polymer({
setIconBadges_: function(params) {
var networkState = this.networkState;
- var type =
- (params.showBadges && networkState) ? networkState.Type : '';
+ var type = (params.showBadges && networkState) ? networkState.Type : '';
if (type == CrOnc.Type.WI_FI) {
this.roaming_ = false;
var security = networkState.WiFi ? networkState.WiFi.Security : '';

Powered by Google App Engine
This is Rietveld 408576698