| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> | 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> | 3 <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
_indicator.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> |
| 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 6 <link rel="import" href="chrome://resources/html/md_select_css.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-a11y-keys/iron-a11
y-keys.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11
y-keys.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 9 <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-input/paper-input
-container.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
-container.html"> |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 <div class="settings-box continuation indent" | 119 <div class="settings-box continuation indent" |
| 120 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]"> | 120 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]"> |
| 121 <div>$i18n{networkSectionWpad}</div> | 121 <div>$i18n{networkSectionWpad}</div> |
| 122 <div class="middle flex">[[WPAD_]]</div> | 122 <div class="middle flex">[[WPAD_]]</div> |
| 123 </div> | 123 </div> |
| 124 | 124 |
| 125 <!-- Manual --> | 125 <!-- Manual --> |
| 126 <div id="proxyDiv" class="settings-box continuation single-column indent" | 126 <div id="proxyDiv" class="settings-box continuation single-column indent" |
| 127 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> | 127 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> |
| 128 <div class="flex layout horizontal"> | 128 <div class="flex layout horizontal"> |
| 129 <div class="flex">$i18n{networkProxyUseSame}</div> | 129 <div id="networkProxyToggleLabel" class="flex"> |
| 130 $i18n{networkProxyUseSame} |
| 131 </div> |
| 130 <paper-toggle-button checked="{{useSameProxy_}}" | 132 <paper-toggle-button checked="{{useSameProxy_}}" |
| 131 disabled="[[!isEditable_('Type', networkProperties, editable, | 133 disabled="[[!isEditable_('Type', networkProperties, editable, |
| 132 useSharedProxies_)]]"> | 134 useSharedProxies_)]]" |
| 135 aria-labelledby="networkProxyToggleLabel"> |
| 133 </paper-toggle-button> | 136 </paper-toggle-button> |
| 134 </div> | 137 </div> |
| 135 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> | 138 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> |
| 136 <network-proxy-input | 139 <network-proxy-input |
| 137 on-proxy-change="onProxyInputChange_" | 140 on-proxy-change="onProxyInputChange_" |
| 138 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, | 141 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, |
| 139 editable, useSharedProxies_)]]" | 142 editable, useSharedProxies_)]]" |
| 140 value="{{proxy_.Manual.HTTPProxy}}" | 143 value="{{proxy_.Manual.HTTPProxy}}" |
| 141 label="$i18n{networkProxy}"> | 144 label="$i18n{networkProxy}"> |
| 142 </network-proxy-input> | 145 </network-proxy-input> |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 </paper-button> | 215 </paper-button> |
| 213 <paper-button class="action-button" | 216 <paper-button class="action-button" |
| 214 on-tap="onAllowSharedDialogConfirm_"> | 217 on-tap="onAllowSharedDialogConfirm_"> |
| 215 $i18n{confirm} | 218 $i18n{confirm} |
| 216 </paper-button> | 219 </paper-button> |
| 217 </div> | 220 </div> |
| 218 </dialog> | 221 </dialog> |
| 219 </template> | 222 </template> |
| 220 <script src="network_proxy.js"></script> | 223 <script src="network_proxy.js"></script> |
| 221 </dom-module> | 224 </dom-module> |
| OLD | NEW |