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

Side by Side Diff: chrome/browser/resources/settings/internet_page/internet_detail_page.html

Issue 1346823005: Elim cr_button from md-settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
6 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_collapse/cr_coll apse.html"> 7 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_collapse/cr_coll apse.html">
7 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr _expand_button.html"> 8 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr _expand_button.html">
8 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_network_ icon.html"> 9 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_network_ icon.html">
9 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_type s.html"> 10 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_type s.html">
10 <link rel="import" href="network_apnlist.html"> 11 <link rel="import" href="network_apnlist.html">
11 <link rel="import" href="network_ip_config.html"> 12 <link rel="import" href="network_ip_config.html">
12 <link rel="import" href="network_nameservers.html"> 13 <link rel="import" href="network_nameservers.html">
13 <link rel="import" href="network_property_list.html"> 14 <link rel="import" href="network_property_list.html">
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 64
64 <!-- Properties to always show if present. --> 65 <!-- Properties to always show if present. -->
65 <network-property-list 66 <network-property-list
66 fields="[[getInfoFields_(networkState)]]" 67 fields="[[getInfoFields_(networkState)]]"
67 network-state="[[networkState]]"> 68 network-state="[[networkState]]">
68 </network-property-list> 69 </network-property-list>
69 </div> 70 </div>
70 71
71 <!-- Button row: Advanced + Disconnect | Connect. --> 72 <!-- Button row: Advanced + Disconnect | Connect. -->
72 <div class="layout horizontal center"> 73 <div class="layout horizontal center">
73 <cr-button toggles active="{{advancedExpanded}}" 74 <paper-button toggles noink active="{{advancedExpanded}}"
74 hidden$="[[!hasAdvancedOrDeviceFields_(networkState)]]"> 75 hidden$="[[!hasAdvancedOrDeviceFields_(networkState)]]">
75 Advanced 76 Advanced
76 </cr-button> 77 </paper-button>
77 <span class="flex"></span> 78 <span class="flex"></span>
78 <cr-button hidden$="[[!showViewAccount_(networkState)]]" 79 <paper-button hidden$="[[!showViewAccount_(networkState)]]"
79 on-click="onViewAccountClicked_"> 80 on-tap="onViewAccountClicked_">
80 View Account 81 View Account
81 </cr-button> 82 </paper-button>
82 <cr-button hidden$="[[!showActivate_(networkState)]]" 83 <paper-button hidden$="[[!showActivate_(networkState)]]"
83 on-click="onActivateClicked_"> 84 on-tap="onActivateClicked_">
84 Activate 85 Activate
85 </cr-button> 86 </paper-button>
86 <cr-button hidden$="[[!showConnect_(networkState)]]" 87 <paper-button hidden$="[[!showConnect_(networkState)]]"
87 disabled="[[!enableConnect_(networkState)]]" 88 disabled="[[!enableConnect_(networkState)]]"
88 on-click="onConnectClicked_"> 89 on-tap="onConnectClicked_">
89 Connect 90 Connect
90 </cr-button> 91 </paper-button>
91 <cr-button hidden$="[[!showDisconnect_(networkState)]]" 92 <paper-button hidden$="[[!showDisconnect_(networkState)]]"
92 on-click="onDisconnectClicked_"> 93 on-tap="onDisconnectClicked_">
93 Disconnect 94 Disconnect
94 </cr-button> 95 </paper-button>
95 </div> 96 </div>
96 97
97 <!-- Advanced section --> 98 <!-- Advanced section -->
98 <div id="advancedDiv" class="layout vertical" 99 <div id="advancedDiv" class="layout vertical"
99 hidden$="[[!hasAdvancedOrDeviceFields_(networkState)]]"> 100 hidden$="[[!hasAdvancedOrDeviceFields_(networkState)]]">
100 <cr-collapse opened="[[advancedExpanded]]"> 101 <cr-collapse opened="[[advancedExpanded]]">
101 <!-- Advanced properties --> 102 <!-- Advanced properties -->
102 <div id="advancedInfoDiv" class="layout vertical"> 103 <div id="advancedInfoDiv" class="layout vertical">
103 <network-property-list 104 <network-property-list
104 fields="[[getAdvancedFields_(networkState)]]" 105 fields="[[getAdvancedFields_(networkState)]]"
105 network-state="[[networkState]]"> 106 network-state="[[networkState]]">
106 </network-property-list> 107 </network-property-list>
107 </div> 108 </div>
108 109
109 <!-- Network (APN, address, nameservers) --> 110 <!-- Network (APN, address, nameservers) -->
110 <div id="addressDiv" class="layout vertical" 111 <div id="addressDiv" class="layout vertical"
111 hidden$="[[!hasNetworkSection_(networkState)]]"> 112 hidden$="[[!hasNetworkSection_(networkState)]]">
112 <cr-button toggles active="{{addressExpanded}}"> 113 <paper-button toggles noink active="{{addressExpanded}}">
113 Network 114 Network
114 </cr-button> 115 </paper-button>
115 <cr-collapse opened="[[addressExpanded]]"> 116 <cr-collapse opened="[[addressExpanded]]">
116 <div class="layout vertical flex"> 117 <div class="layout vertical flex">
117 <network-apnlist editable 118 <network-apnlist editable
118 hidden$="[[!isType_(networkState, NetworkType.CELLULAR)]]" 119 hidden$="[[!isType_(networkState, NetworkType.CELLULAR)]]"
119 network-state="[[networkState]]" 120 network-state="[[networkState]]"
120 apnlist="[[networkState.Cellular.APNList]]" 121 apnlist="[[networkState.Cellular.APNList]]"
121 on-apn-change="onNetworkPropertyChange_"> 122 on-apn-change="onNetworkPropertyChange_">
122 </network-apnlist> 123 </network-apnlist>
123 <network-ip-config editable 124 <network-ip-config editable
124 network-state="[[networkState]]" 125 network-state="[[networkState]]"
125 on-ip-change="onIPConfigChange_"> 126 on-ip-change="onIPConfigChange_">
126 </network-ip-config> 127 </network-ip-config>
127 <network-nameservers editable 128 <network-nameservers editable
128 network-state="[[networkState]]" 129 network-state="[[networkState]]"
129 on-nameservers-change="onIPConfigChange_"> 130 on-nameservers-change="onIPConfigChange_">
130 </network-nameservers> 131 </network-nameservers>
131 </div> 132 </div>
132 </cr-collapse> 133 </cr-collapse>
133 </div> 134 </div>
134 135
135 <!-- Proxy --> 136 <!-- Proxy -->
136 <div class="layout vertical" 137 <div class="layout vertical"
137 hidden$="[[!hasNetworkSection_(networkState)]]"> 138 hidden$="[[!hasNetworkSection_(networkState)]]">
138 <cr-button toggles active="{{proxyExpanded}}"> 139 <paper-button toggles noink active="{{proxyExpanded}}">
139 Proxy 140 Proxy
140 </cr-button> 141 </paper-button>
141 <cr-collapse opened="[[proxyExpanded]]"> 142 <cr-collapse opened="[[proxyExpanded]]">
142 <div id="proxyDiv" class="layout vertical flex"> 143 <div id="proxyDiv" class="layout vertical flex">
143 <network-proxy editable 144 <network-proxy editable
144 network-state="[[networkState]]" 145 network-state="[[networkState]]"
145 on-proxy-change="onProxyChange_"> 146 on-proxy-change="onProxyChange_">
146 </network-proxy> 147 </network-proxy>
147 </div> 148 </div>
148 </cr-collapse> 149 </cr-collapse>
149 </div> 150 </div>
150 151
151 <!-- Device properties --> 152 <!-- Device properties -->
152 <div class="layout vertical" 153 <div class="layout vertical"
153 hidden$="[[!hasDeviceFields_(networkState)]]"> 154 hidden$="[[!hasDeviceFields_(networkState)]]">
154 <cr-button toggles active="{{deviceExpanded}}"> 155 <paper-button toggles noink active="{{deviceExpanded}}">
155 Device 156 Device
156 </cr-button> 157 </paper-button>
157 <cr-collapse opened="[[deviceExpanded]]"> 158 <cr-collapse opened="[[deviceExpanded]]">
158 <network-property-list 159 <network-property-list
159 fields="[[getDeviceFields_(networkState)]]" 160 fields="[[getDeviceFields_(networkState)]]"
160 network-state="[[networkState]]"> 161 network-state="[[networkState]]">
161 </network-property-list> 162 </network-property-list>
162 <!-- TODO(stevenjb): Cellular SIM --> 163 <!-- TODO(stevenjb): Cellular SIM -->
163 </cr-collapse> 164 </cr-collapse>
164 </div> 165 </div>
165 </cr-collapse> 166 </cr-collapse>
166 </div> 167 </div>
167 </div> 168 </div>
168 </div> 169 </div>
169 </template> 170 </template>
170 <script src="internet_detail_page.js"></script> 171 <script src="internet_detail_page.js"></script>
171 </dom-module> 172 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698