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

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

Issue 2069323002: Add support for custom entries in <cr_network_select/>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@604119--Implement-Chrome-OS-out-of-box-flow-in-Material-Design--ImplementNetworkSelectionScreen
Patch Set: Fix compile. Created 4 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
Index: ui/webui/resources/cr_elements/network/cr_network_list_network_item.js
diff --git a/ui/webui/resources/cr_elements/network/cr_network_list_item.js b/ui/webui/resources/cr_elements/network/cr_network_list_network_item.js
similarity index 82%
rename from ui/webui/resources/cr_elements/network/cr_network_list_item.js
rename to ui/webui/resources/cr_elements/network/cr_network_list_network_item.js
index b922df8e63ac67e95353137151b75b079d990ec0..22ccf1c2d8fe494d59e837528b04f18224c58d6a 100644
--- a/ui/webui/resources/cr_elements/network/cr_network_list_item.js
+++ b/ui/webui/resources/cr_elements/network/cr_network_list_network_item.js
@@ -65,10 +65,10 @@ function getNetworkName(network) {
}
/**
- * Polymer class definition for 'cr-network-list-item'.
+ * Polymer class definition for 'cr-network-list-network-item'.
*/
Polymer({
- is: 'cr-network-list-item',
+ is: 'cr-network-list-network-item',
properties: {
/**
@@ -96,6 +96,14 @@ Polymer({
value: 'none',
observer: 'networkStateChanged_'
},
+
+ /**
+ * Whether to show buttons.
+ */
+ showButtons: {
+ type: Boolean,
+ value: false,
+ },
},
/**
@@ -105,26 +113,30 @@ Polymer({
networkStateChanged_: function() {
if (!this.networkState)
return;
-
var network = this.networkState;
var isDisconnected =
network.ConnectionState == CrOnc.ConnectionState.NOT_CONNECTED;
+
+ if (network.ConnectionState == CrOnc.ConnectionState.CONNECTED) {
+ this.fire("network-connected", this.networkState);
+ }
+
var name = getNetworkName(network);
if (this.isListItem_(this.listItemType)) {
- this.$.networkName.textContent = name;
- this.$.networkName.classList.toggle('connected', !isDisconnected);
+ this.$.itemName.textContent = name;
+ this.$.itemName.classList.toggle('connected', !isDisconnected);
return;
}
if (network.Name && network.ConnectionState) {
- this.$.networkName.textContent = getText('OncType' + network.Type);
- this.$.networkName.classList.toggle('connected', false);
+ this.$.itemName.textContent = getText('OncType' + network.Type);
+ this.$.itemName.classList.toggle('connected', false);
this.$.networkStateText.textContent =
getConnectionStateText(network.ConnectionState, name);
this.$.networkStateText.classList.toggle('connected', !isDisconnected);
return;
}
- this.$.networkName.textContent = getText('OncType' + network.Type);
- this.$.networkName.classList.toggle('connected', false);
+ this.$.itemName.textContent = getText('OncType' + network.Type);
+ this.$.itemName.classList.toggle('connected', false);
this.$.networkStateText.textContent = getText('networkDisabled');
this.$.networkStateText.classList.toggle('connected', false);
@@ -216,5 +228,23 @@ Polymer({
isListItemType_: function(listItemType, type) {
return listItemType == type;
},
+
+ /**
+ * @param {boolean} showButtons this.showButtons property
+ * @param {string} listItemType this.listItemType property
+ * @private
+ */
+ isSettingsButtonVisible_: function(showButtons, listItemType) {
+ return showButtons && this.isListItemType_(listItemType, 'visible');
+ },
+
+ /**
+ * @param {boolean} showButtons this.showButtons property
+ * @param {string} listItemType this.listItemType property
+ * @private
+ */
+ areKnownButtonsVisible_: function(showButtons, listItemType) {
+ return showButtons && this.isListItemType_(listItemType, 'known');
+ },
});
})();

Powered by Google App Engine
This is Rietveld 408576698