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

Unified Diff: ui/webui/resources/cr_elements/network/cr_network_list_item.html

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: Remove extra files 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_item.html
diff --git a/ui/webui/resources/cr_elements/network/cr_network_list_item.html b/ui/webui/resources/cr_elements/network/cr_network_list_item.html
index 23fca1359d95e54dc59f6b526036d9360484e201..c06ec046b1ab22d4f887af2a447acab3923d9222 100644
--- a/ui/webui/resources/cr_elements/network/cr_network_list_item.html
+++ b/ui/webui/resources/cr_elements/network/cr_network_list_item.html
@@ -1,6 +1,7 @@
<link rel="import" href="chrome://resources/cr_elements/icons.html">
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/icons.html">
stevenjb 2016/06/16 17:41:34 This is going to be disallowed soon. It takes a ve
Alexander Alekseev 2016/06/22 08:24:18 Done.
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
<link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.html">
<link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.html">
@@ -91,8 +92,13 @@
<div id="divOuter" is-list-item$="[[isListItem_(listItemType)]]">
<div id="divIcon">
<cr-network-icon id="icon" is-list-item="[[isListItem_(listItemType)]]"
- network-state="[[networkState]]">
+ network-state="[[networkState]]"
+ hidden$="[[networkState.overridePolymerIcon]]">
</cr-network-icon>
+ <iron-icon id="substituteIcon"
+ icon="[[networkState.overridePolymerIcon]]"
+ hidden$="[[!networkState.overridePolymerIcon]]">
+ </iron-icon>
</div>
<div id="divText" class="layout horizontal flex">
<span id="networkName"></span>
@@ -100,12 +106,12 @@
</span>
</div>
<div class="buttons"
- hidden$="[[!isListItemType_(listItemType, 'visible')]]">
+ hidden$="[[settingsButtonHidden]]">
<paper-icon-button icon="cr:settings" on-tap="fireShowDetails_">
</paper-icon-button>
</div>
<div class="known buttons"
- hidden$="[[!isListItemType_(listItemType, 'known')]]">
+ hidden$="[[knownButtonsHidden]]">
<paper-icon-button icon="[[sharedIcon_(networkState)]]" disabled>
</paper-icon-button>
<paper-icon-button icon="[[preferredIcon_(networkState)]]"

Powered by Google App Engine
This is Rietveld 408576698