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

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

Issue 2617533003: MD Settings: change most checkboxes to toggles (leave dialogs alone) (Closed)
Patch Set: fix tests Created 3 years, 11 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/cr_elements/cr_expand_button/cr_expa nd_button.html"> 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
2 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html">
3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html">
5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
7 <link rel="import" href="chrome://resources/html/polymer.html"> 7 <link rel="import" href="chrome://resources/html/polymer.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
12 <link rel="import" href="/prefs/prefs.html"> 12 <link rel="import" href="/prefs/prefs.html">
13 <link rel="import" href="/route.html"> 13 <link rel="import" href="/route.html">
14 <link rel="import" href="internet_shared_css.html"> 14 <link rel="import" href="internet_shared_css.html">
15 <link rel="import" href="network_apnlist.html"> 15 <link rel="import" href="network_apnlist.html">
16 <link rel="import" href="network_ip_config.html"> 16 <link rel="import" href="network_ip_config.html">
17 <link rel="import" href="network_nameservers.html"> 17 <link rel="import" href="network_nameservers.html">
18 <link rel="import" href="network_property_list.html"> 18 <link rel="import" href="network_property_list.html">
19 <link rel="import" href="network_proxy.html"> 19 <link rel="import" href="network_proxy.html">
20 <link rel="import" href="network_siminfo.html"> 20 <link rel="import" href="network_siminfo.html">
21 21
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 <div>[[i18n('networkPrimaryUserControlled', primaryUserEmail_)]]</div> 147 <div>[[i18n('networkPrimaryUserControlled', primaryUserEmail_)]]</div>
148 </div> 148 </div>
149 </div> 149 </div>
150 </template> 150 </template>
151 <template is="dom-if" if="[[!isSecondaryUser_]]"> 151 <template is="dom-if" if="[[!isSecondaryUser_]]">
152 <!-- Top level properties --> 152 <!-- Top level properties -->
153 <div class="layout vertical"> 153 <div class="layout vertical">
154 <!-- Prefer this network. --> 154 <!-- Prefer this network. -->
155 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]"> 155 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]">
156 <div class="settings-box"> 156 <div class="settings-box">
157 <paper-checkbox checked="{{preferNetwork_}}" 157 <div class="start">$i18n{networkPrefer}</div>
158 disabled="[[isNetworkPolicyEnforced(
159 networkProperties.Priority)]]">
160 $i18n{networkPrefer}
161 </paper-checkbox>
162 <cr-policy-network-indicator 158 <cr-policy-network-indicator
163 property="[[networkProperties.Priority]]"> 159 property="[[networkProperties.Priority]]">
164 </cr-policy-network-indicator> 160 </cr-policy-network-indicator>
161 <paper-toggle-button checked="{{preferNetwork_}}"
162 disabled="[[isNetworkPolicyEnforced(
163 networkProperties.Priority)]]">
164 </paper-toggle-button>
165 </div> 165 </div>
166 </template> 166 </template>
167 <!-- Autoconnect. --> 167 <!-- Autoconnect. -->
168 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]"> 168 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]">
169 <div class="settings-box"> 169 <div class="settings-box">
170 <paper-checkbox checked="{{autoConnect_}}" 170 <div class="start">$i18n{networkAutoConnect}</div>
171 disabled="[[isNetworkPolicyEnforced(
172 getManagedAutoConnect_(networkProperties))]]">
173 $i18n{networkAutoConnect}
174 </paper-checkbox>
175 <cr-policy-network-indicator 171 <cr-policy-network-indicator
176 property="[[getManagedAutoConnect_(networkProperties)]]"> 172 property="[[getManagedAutoConnect_(networkProperties)]]">
177 </cr-policy-network-indicator> 173 </cr-policy-network-indicator>
174 <paper-toggle-button checked="{{autoConnect_}}"
175 disabled="[[isNetworkPolicyEnforced(
176 getManagedAutoConnect_(networkProperties))]]">
177 </paper-toggle-button>
178 </div> 178 </div>
179 </template> 179 </template>
180 <!-- SIM Info (Cellular only). --> 180 <!-- SIM Info (Cellular only). -->
181 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> 181 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]">
182 <div class="settings-box single-column stretch"> 182 <div class="settings-box single-column stretch">
183 <network-siminfo 183 <network-siminfo
184 editable on-siminfo-change="onNetworkPropertyChange_" 184 editable on-siminfo-change="onNetworkPropertyChange_"
185 network-properties="[[networkProperties]]" 185 network-properties="[[networkProperties]]"
186 networking-private="[[networkingPrivate]]"> 186 networking-private="[[networkingPrivate]]">
187 </network-siminfo> 187 </network-siminfo>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 on-proxy-change="onProxyChange_" 262 on-proxy-change="onProxyChange_"
263 network-properties="[[networkProperties]]"> 263 network-properties="[[networkProperties]]">
264 </network-proxy> 264 </network-proxy>
265 </template> 265 </template>
266 </div> 266 </div>
267 </iron-collapse> 267 </iron-collapse>
268 </template> 268 </template>
269 </template> 269 </template>
270 <script src="internet_detail_page.js"></script> 270 <script src="internet_detail_page.js"></script>
271 </dom-module> 271 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698