| OLD | NEW |
| 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/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.
html"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.
html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> | 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
| 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat
or.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat
or.html"> |
| 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> | 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> |
| 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> | 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> |
| 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 9 <link rel="import" href="chrome://resources/html/polymer.html"> | 9 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> |
| 11 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 11 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 12 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 12 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 14 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> | 14 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> |
| 15 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 15 <link rel="import" href="../prefs/prefs.html"> | 16 <link rel="import" href="../prefs/prefs.html"> |
| 16 <link rel="import" href="../route.html"> | 17 <link rel="import" href="../route.html"> |
| 17 <link rel="import" href="internet_shared_css.html"> | 18 <link rel="import" href="internet_shared_css.html"> |
| 18 <link rel="import" href="network_apnlist.html"> | 19 <link rel="import" href="network_apnlist.html"> |
| 19 <link rel="import" href="network_ip_config.html"> | 20 <link rel="import" href="network_ip_config.html"> |
| 20 <link rel="import" href="network_nameservers.html"> | 21 <link rel="import" href="network_nameservers.html"> |
| 21 <link rel="import" href="network_property_list.html"> | 22 <link rel="import" href="network_property_list.html"> |
| 22 <link rel="import" href="network_proxy.html"> | 23 <link rel="import" href="network_proxy.html"> |
| 23 <link rel="import" href="network_siminfo.html"> | 24 <link rel="import" href="network_siminfo.html"> |
| 24 | 25 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 $i18n{networkButtonActivate} | 106 $i18n{networkButtonActivate} |
| 106 </paper-button> | 107 </paper-button> |
| 107 <paper-button class="secondary-button" on-tap="onConfigureTap_" | 108 <paper-button class="secondary-button" on-tap="onConfigureTap_" |
| 108 hidden$="[[!showConfigure_(networkProperties, globalPolicy)]]"> | 109 hidden$="[[!showConfigure_(networkProperties, globalPolicy)]]"> |
| 109 $i18n{networkButtonConfigure} | 110 $i18n{networkButtonConfigure} |
| 110 </paper-button> | 111 </paper-button> |
| 111 </template> | 112 </template> |
| 112 <paper-button class="primary-button" on-tap="onConnectTap_" | 113 <paper-button class="primary-button" on-tap="onConnectTap_" |
| 113 hidden$="[[!showConnect_(networkProperties, globalPolicy)]]" | 114 hidden$="[[!showConnect_(networkProperties, globalPolicy)]]" |
| 114 disabled="[[!enableConnect_(networkProperties, defaultNetwork, | 115 disabled="[[!enableConnect_(networkProperties, defaultNetwork, |
| 115 globalPolicy)]]"> | 116 globalPolicy)]]"> |
| 116 $i18n{networkButtonConnect} | 117 $i18n{networkButtonConnect} |
| 117 </paper-button> | 118 </paper-button> |
| 118 <paper-button class="primary-button" on-tap="onDisconnectTap_" | 119 <paper-button class="primary-button" on-tap="onDisconnectTap_" |
| 119 hidden$="[[!showDisconnect_(networkProperties)]]"> | 120 hidden$="[[!showDisconnect_(networkProperties)]]"> |
| 120 $i18n{networkButtonDisconnect} | 121 $i18n{networkButtonDisconnect} |
| 121 </paper-button> | 122 </paper-button> |
| 122 </div> | 123 </div> |
| 123 </div> | 124 </div> |
| 124 | 125 |
| 125 <!-- Disabled by policy / Shared messages. --> | 126 <!-- Disabled by policy / Shared messages. --> |
| (...skipping 23 matching lines...) Expand all Loading... |
| 149 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]"> | 150 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]"> |
| 150 <div class="settings-box"> | 151 <div class="settings-box"> |
| 151 <div id="preferNetworkToggleLabel"class="start"> | 152 <div id="preferNetworkToggleLabel"class="start"> |
| 152 $i18n{networkPrefer} | 153 $i18n{networkPrefer} |
| 153 </div> | 154 </div> |
| 154 <cr-policy-network-indicator | 155 <cr-policy-network-indicator |
| 155 property="[[networkProperties.Priority]]"> | 156 property="[[networkProperties.Priority]]"> |
| 156 </cr-policy-network-indicator> | 157 </cr-policy-network-indicator> |
| 157 <paper-toggle-button checked="{{preferNetwork_}}" | 158 <paper-toggle-button checked="{{preferNetwork_}}" |
| 158 disabled="[[isNetworkPolicyEnforced( | 159 disabled="[[isNetworkPolicyEnforced( |
| 159 networkProperties.Priority)]]" | 160 networkProperties.Priority)]]" |
| 160 aria-labelledby="preferNetworkToggleLabel"> | 161 aria-labelledby="preferNetworkToggleLabel"> |
| 161 </paper-toggle-button> | 162 </paper-toggle-button> |
| 162 </div> | 163 </div> |
| 163 </template> | 164 </template> |
| 164 <!-- Autoconnect. --> | 165 <!-- Autoconnect. --> |
| 165 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]"> | 166 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]"> |
| 166 <div class="settings-box"> | 167 <div class="settings-box"> |
| 167 <div id="autoConnectToggleLabel" class="start"> | 168 <div id="autoConnectToggleLabel" class="start"> |
| 168 $i18n{networkAutoConnect} | 169 $i18n{networkAutoConnect} |
| 169 </div> | 170 </div> |
| 170 <cr-policy-network-indicator | 171 <cr-policy-network-indicator |
| 171 property="[[getManagedAutoConnect_(networkProperties)]]"> | 172 property="[[getManagedAutoConnect_(networkProperties)]]"> |
| 172 </cr-policy-network-indicator> | 173 </cr-policy-network-indicator> |
| 173 <paper-toggle-button checked="{{autoConnect_}}" | 174 <paper-toggle-button checked="{{autoConnect_}}" |
| 174 disabled="[[!enableAutoConnect_(networkProperties, | 175 disabled="[[!enableAutoConnect_(networkProperties, |
| 175 globalPolicy)]]" | 176 globalPolicy)]]" |
| 176 aria-labelledby="autoConnectToggleLabel"> | 177 aria-labelledby="autoConnectToggleLabel"> |
| 177 </paper-toggle-button> | 178 </paper-toggle-button> |
| 178 </div> | 179 </div> |
| 179 </template> | 180 </template> |
| 181 <!-- Data roaming (Cellular only). --> |
| 182 <template is="dom-if" |
| 183 if="[[isType_(NetworkType_.CELLULAR, networkProperties)]]"> |
| 184 <div class="settings-box"> |
| 185 <settings-toggle-button id="allowDataRoaming" class="start" |
| 186 pref="{{prefs.cros.signed.data_roaming_enabled}}" |
| 187 label="$i18n{networkAllowDataRoaming}"> |
| 188 </settings-toggle-button> |
| 189 </div> |
| 190 </template> |
| 180 <!-- SIM Info (Cellular only). --> | 191 <!-- SIM Info (Cellular only). --> |
| 181 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> | 192 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> |
| 182 <div class="settings-box single-column stretch"> | 193 <div class="settings-box single-column stretch"> |
| 183 <network-siminfo | 194 <network-siminfo |
| 184 editable on-siminfo-change="onNetworkPropertyChange_" | 195 editable on-siminfo-change="onNetworkPropertyChange_" |
| 185 network-properties="[[networkProperties]]" | 196 network-properties="[[networkProperties]]" |
| 186 networking-private="[[networkingPrivate]]"> | 197 networking-private="[[networkingPrivate]]"> |
| 187 </network-siminfo> | 198 </network-siminfo> |
| 188 </div> | 199 </div> |
| 189 </template> | 200 </template> |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 <network-proxy editable prefs="{{prefs}}" | 292 <network-proxy editable prefs="{{prefs}}" |
| 282 on-proxy-change="onProxyChange_" | 293 on-proxy-change="onProxyChange_" |
| 283 network-properties="[[networkProperties]]"> | 294 network-properties="[[networkProperties]]"> |
| 284 </network-proxy> | 295 </network-proxy> |
| 285 </iron-collapse> | 296 </iron-collapse> |
| 286 </template> | 297 </template> |
| 287 </template> | 298 </template> |
| 288 </template> | 299 </template> |
| 289 <script src="internet_detail_page.js"></script> | 300 <script src="internet_detail_page.js"></script> |
| 290 </dom-module> | 301 </dom-module> |
| OLD | NEW |