| 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/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/cr_elements/policy/cr_policy_pref_in
dicator.html"> |
| 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 7 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 7 <link rel="import" href="chrome://resources/html/polymer.html"> | 8 <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"> | 9 <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"> | 10 <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"> | 11 <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-toggle-button/pap
er-toggle-button.html"> | 12 <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"> | 13 <link rel="import" href="/prefs/prefs.html"> |
| 13 <link rel="import" href="/route.html"> | 14 <link rel="import" href="/route.html"> |
| 14 <link rel="import" href="internet_shared_css.html"> | 15 <link rel="import" href="internet_shared_css.html"> |
| 15 <link rel="import" href="network_apnlist.html"> | 16 <link rel="import" href="network_apnlist.html"> |
| 16 <link rel="import" href="network_ip_config.html"> | 17 <link rel="import" href="network_ip_config.html"> |
| 17 <link rel="import" href="network_nameservers.html"> | 18 <link rel="import" href="network_nameservers.html"> |
| 18 <link rel="import" href="network_property_list.html"> | 19 <link rel="import" href="network_property_list.html"> |
| 19 <link rel="import" href="network_proxy.html"> | 20 <link rel="import" href="network_proxy.html"> |
| 20 <link rel="import" href="network_siminfo.html"> | 21 <link rel="import" href="network_siminfo.html"> |
| 21 | 22 |
| 22 <dom-module id="settings-internet-detail-page"> | 23 <dom-module id="settings-internet-detail-page"> |
| 23 <template> | 24 <template> |
| 24 <style include="internet-shared"> | 25 <style include="internet-shared"> |
| 25 :host { | 26 :host { |
| 26 padding-bottom: 40px; | 27 padding-bottom: 40px; |
| 27 } | 28 } |
| 28 | 29 |
| 29 cr-network-icon { | 30 cr-network-icon { |
| 30 -webkit-padding-end: 8px; | 31 -webkit-padding-end: 8px; |
| 31 } | 32 } |
| 32 | 33 |
| 33 cr-policy-network-indicator { | 34 cr-policy-network-indicator, |
| 35 cr-policy-pref-indicator { |
| 34 -webkit-margin-start: 10px; | 36 -webkit-margin-start: 10px; |
| 35 } | 37 } |
| 36 | 38 |
| 37 iron-collapse { | 39 iron-collapse { |
| 38 margin: 10px 0; | 40 margin: 10px 0; |
| 39 } | 41 } |
| 40 | 42 |
| 41 iron-icon { | 43 iron-icon { |
| 42 -webkit-margin-end: 10px; | 44 -webkit-margin-end: 10px; |
| 43 } | 45 } |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 <div class="settings-box first"> | 90 <div class="settings-box first"> |
| 89 <div class="start layout horizontal center"> | 91 <div class="start layout horizontal center"> |
| 90 <cr-network-icon network-state="[[networkProperties]]"> | 92 <cr-network-icon network-state="[[networkProperties]]"> |
| 91 </cr-network-icon> | 93 </cr-network-icon> |
| 92 <div id="networkState" | 94 <div id="networkState" |
| 93 connected$="[[isConnectedState_(networkProperties)]]"> | 95 connected$="[[isConnectedState_(networkProperties)]]"> |
| 94 [[getStateText_(networkProperties)]] | 96 [[getStateText_(networkProperties)]] |
| 95 </div> | 97 </div> |
| 96 <template is="dom-if" | 98 <template is="dom-if" |
| 97 if="[[isPolicySource(networkProperties.Source))]]"> | 99 if="[[isPolicySource(networkProperties.Source))]]"> |
| 98 <cr-policy-network-indicator | 100 <cr-policy-pref-indicator |
| 99 indicator-type="[[getIndicatorTypeForSource( | 101 indicator-type="[[getIndicatorTypeForSource( |
| 100 networkProperties.Source)]]"> | 102 networkProperties.Source)]]"> |
| 101 </cr-policy-network-indicator> | 103 </cr-policy-pref-indicator> |
| 102 </template> | 104 </template> |
| 103 </div> | 105 </div> |
| 104 <div id="buttonDiv" class="layout horizontal center"> | 106 <div id="buttonDiv" class="layout horizontal center"> |
| 105 <template is="dom-if" if="[[!isSecondaryUser_]]"> | 107 <template is="dom-if" if="[[!isSecondaryUser_]]"> |
| 106 <paper-button class="secondary-button" on-tap="onForgetTap_" | 108 <paper-button class="secondary-button" on-tap="onForgetTap_" |
| 107 hidden$="[[!showForget_(networkProperties)]]"> | 109 hidden$="[[!showForget_(networkProperties)]]"> |
| 108 $i18n{networkButtonForget} | 110 $i18n{networkButtonForget} |
| 109 </paper-button> | 111 </paper-button> |
| 110 <paper-button class="secondary-button" on-tap="onViewAccountTap_" | 112 <paper-button class="secondary-button" on-tap="onViewAccountTap_" |
| 111 hidden$="[[!showViewAccount_(networkProperties)]]"> | 113 hidden$="[[!showViewAccount_(networkProperties)]]"> |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 on-proxy-change="onProxyChange_" | 264 on-proxy-change="onProxyChange_" |
| 263 network-properties="[[networkProperties]]"> | 265 network-properties="[[networkProperties]]"> |
| 264 </network-proxy> | 266 </network-proxy> |
| 265 </template> | 267 </template> |
| 266 </div> | 268 </div> |
| 267 </iron-collapse> | 269 </iron-collapse> |
| 268 </template> | 270 </template> |
| 269 </template> | 271 </template> |
| 270 <script src="internet_detail_page.js"></script> | 272 <script src="internet_detail_page.js"></script> |
| 271 </dom-module> | 273 </dom-module> |
| OLD | NEW |