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

Unified Diff: chrome/browser/resources/settings/internet_page/network_summary.html

Issue 1100993002: Implement md-settings network lists. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename device-enabled-toggled, fix disabled network text Created 5 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.html
diff --git a/chrome/browser/resources/settings/internet_page/network_summary.html b/chrome/browser/resources/settings/internet_page/network_summary.html
index f612de5a165861828f400b05c3e6cdeef79846f3..2edbd7a765caf397415e200909c35ddd16eab3e7 100644
--- a/chrome/browser/resources/settings/internet_page/network_summary.html
+++ b/chrome/browser/resources/settings/internet_page/network_summary.html
@@ -1,27 +1,52 @@
<link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_network_list_item/cr_network_list_item.html">
+<link rel="import" href="chrome://resources/polymer/core-style/core-style.html">
<link rel="import" href="chrome://resources/cr_elements/cr_onc/cr_onc_data.html">
+<link rel="import" href="network_summary_item.html">
<link rel="import" href="network_summary_style.html">
<polymer-element name="cr-network-summary">
<template>
<core-style ref="networkSummaryStyle"></core-style>
<div id="summary" vertical layout>
- <cr-network-list-item networkState="{{networkStates.Ethernet}}"
- hidden?="{{!networkStates.Ethernet}}">
- </cr-network-list-item>
- <cr-network-list-item networkState="{{networkStates.WiFi}}"
- hidden?="{{!networkStates.WiFi}}">
- </cr-network-list-item>
- <cr-network-list-item networkState="{{networkStates.Cellular}}"
- hidden?="{{!networkStates.Cellular}}">
- </cr-network-list-item>
- <cr-network-list-item networkState="{{networkStates.WiMAX}}"
- hidden?="{{!networkStates.WiMAX}}">
- </cr-network-list-item>
- <cr-network-list-item networkState="{{networkStates.VPN}}"
- hidden?="{{!networkStates.VPN}}">
- </cr-network-list-item>
+ <cr-network-summary-item
+ deviceState="{{deviceStates.Ethernet}}"
+ hidden?="{{!itemIsVisible_(deviceStates.Ethernet)}}"
+ networkState="{{networkStates.Ethernet}}"
+ networkStateList="{{networkStateLists.Ethernet}}"
+ on-selected="{{onSelected_}}">
+ </cr-network-summary-item>
+ <cr-network-summary-item
+ deviceState="{{deviceStates.WiFi}}"
+ hidden?="{{!itemIsVisible_(deviceStates.WiFi)}}"
Jeremy Klein 2015/04/27 22:29:03 Looking at this again, I feel like maybe this shou
stevenjb 2015/04/28 01:05:02 For a more generic element I would argue that the
+ networkState="{{networkStates.WiFi}}"
+ networkStateList="{{networkStateLists.WiFi}}"
+ on-expanded="{{onWiFiExpanded_}}"
+ on-selected="{{onSelected_}}"
+ on-device-enabled-toggled="{{onDeviceEnabledToggled_}}">
+ </cr-network-summary-item>
+ <cr-network-summary-item
+ deviceState="{{deviceStates.Cellular}}"
+ hidden?="{{!itemIsVisible_(deviceStates.Cellular)}}"
+ networkState="{{networkStates.Cellular}}"
+ networkStateList="{{networkStateLists.Cellular}}"
+ on-selected="{{onSelected_}}"
+ on-device-enabled-toggled="{{onDeviceEnabledToggled_}}">
+ </cr-network-summary-item>
+ <cr-network-summary-item
+ deviceState="{{deviceStates.WiMAX}}"
+ hidden?="{{!itemIsVisible_(deviceStates.WiMAX)}}"
+ networkState="{{networkStates.WiMAX}}"
+ networkStateList="{{networkStateLists.WiMAX}}"
+ on-selected="{{onSelected_}}"
+ on-device-enabled-toggled="{{onDeviceEnabledToggled_}}">
+ </cr-network-summary-item>
+ <cr-network-summary-item
+ deviceState="{{deviceStates.VPN}}"
+ hidden?="{{!itemIsVisible_(deviceStates.VPN)}}"
+ networkState="{{networkStates.VPN}}"
+ networkStateList="{{networkStateLists.VPN}}"
+ on-selected="{{onSelected_}}">
+ </cr-network-summary-item>
</div>
</template>
<script src="network_summary.js"></script>

Powered by Google App Engine
This is Rietveld 408576698