| 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/paper-button/paper-butt
on.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-input/paper-input
-container.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
.html"> | 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.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="/controls/extension_controlled_indicator.html"> | 13 <link rel="import" href="/controls/extension_controlled_indicator.html"> |
| 13 <link rel="import" href="/controls/settings_toggle_button.html"> | 14 <link rel="import" href="/controls/settings_toggle_button.html"> |
| 14 <link rel="import" href="/i18n_setup.html"> | 15 <link rel="import" href="/i18n_setup.html"> |
| 15 <link rel="import" href="/prefs/prefs_behavior.html"> | 16 <link rel="import" href="/prefs/prefs_behavior.html"> |
| 16 <link rel="import" href="/settings_vars_css.html"> | 17 <link rel="import" href="/settings_vars_css.html"> |
| 17 <link rel="import" href="internet_shared_css.html"> | 18 <link rel="import" href="internet_shared_css.html"> |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 <div id="proxyDiv" class="settings-box continuation single-column indent" | 126 <div id="proxyDiv" class="settings-box continuation single-column indent" |
| 126 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> | 127 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> |
| 127 <div class="flex layout horizontal"> | 128 <div class="flex layout horizontal"> |
| 128 <div class="flex">$i18n{networkProxyUseSame}</div> | 129 <div class="flex">$i18n{networkProxyUseSame}</div> |
| 129 <paper-toggle-button checked="{{useSameProxy_}}" | 130 <paper-toggle-button checked="{{useSameProxy_}}" |
| 130 disabled="[[!isEditable_('Type', networkProperties, editable, | 131 disabled="[[!isEditable_('Type', networkProperties, editable, |
| 131 useSharedProxies_)]]"> | 132 useSharedProxies_)]]"> |
| 132 </paper-toggle-button> | 133 </paper-toggle-button> |
| 133 </div> | 134 </div> |
| 134 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> | 135 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> |
| 135 <network-proxy-input | 136 <network-proxy-input |
| 136 on-proxy-change="onProxyInputChange_" | 137 on-proxy-change="onProxyInputChange_" |
| 137 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, | 138 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, |
| 138 editable, useSharedProxies_)]]" | 139 editable, useSharedProxies_)]]" |
| 139 value="{{proxy_.Manual.HTTPProxy}}" | 140 value="{{proxy_.Manual.HTTPProxy}}" |
| 140 label="$i18n{networkProxy}"> | 141 label="$i18n{networkProxy}"> |
| 141 </network-proxy-input> | 142 </network-proxy-input> |
| 142 </div> | 143 </div> |
| 143 <div hidden$="[[useSameProxy_]]" class="layout vertical"> | 144 <div hidden$="[[useSameProxy_]]" class="layout vertical"> |
| 144 <network-proxy-input | 145 <network-proxy-input |
| 145 on-proxy-change="onProxyInputChange_" | 146 on-proxy-change="onProxyInputChange_" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 174 <div id="exceptionsDiv" | 175 <div id="exceptionsDiv" |
| 175 hidden="[[!isEditable_('Type', networkProperties, editable, | 176 hidden="[[!isEditable_('Type', networkProperties, editable, |
| 176 useSharedProxies_)]]"> | 177 useSharedProxies_)]]"> |
| 177 <div>$i18n{networkProxyExceptionList}</div> | 178 <div>$i18n{networkProxyExceptionList}</div> |
| 178 <network-proxy-exclusions on-proxy-change="onProxyExclusionsChange_" | 179 <network-proxy-exclusions on-proxy-change="onProxyExclusionsChange_" |
| 179 exclusions="{{proxy_.ExcludeDomains}}"> | 180 exclusions="{{proxy_.ExcludeDomains}}"> |
| 180 </network-proxy-exclusions> | 181 </network-proxy-exclusions> |
| 181 <div class="layout horizontal"> | 182 <div class="layout horizontal"> |
| 182 <paper-input-container no-label-float class="flex"> | 183 <paper-input-container no-label-float class="flex"> |
| 183 <input id="proxyExclusion" is="iron-input"> | 184 <input id="proxyExclusion" is="iron-input"> |
| 185 <iron-a11y-keys keys="enter" |
| 186 on-keys-pressed="onAddProxyExclusionTap_"> |
| 187 </iron-a11y-keys> |
| 184 </paper-input-container> | 188 </paper-input-container> |
| 185 <paper-button on-tap="onAddProxyExclusionTap_"> | 189 <paper-button on-tap="onAddProxyExclusionTap_"> |
| 186 $i18n{networkProxyAddException} | 190 $i18n{networkProxyAddException} |
| 187 </paper-button> | 191 </paper-button> |
| 188 </div> | 192 </div> |
| 189 </div> | 193 </div> |
| 190 | 194 |
| 191 <paper-button id="saveManualProxy" | 195 <paper-button id="saveManualProxy" |
| 192 on-tap="onSaveProxyTap_" class="action-button" | 196 on-tap="onSaveProxyTap_" class="action-button" |
| 193 disabled="[[!isSaveManualProxyEnabled_(networkProperties, | 197 disabled="[[!isSaveManualProxyEnabled_(networkProperties, |
| (...skipping 14 matching lines...) Expand all Loading... |
| 208 </paper-button> | 212 </paper-button> |
| 209 <paper-button class="action-button" | 213 <paper-button class="action-button" |
| 210 on-tap="onAllowSharedDialogConfirm_"> | 214 on-tap="onAllowSharedDialogConfirm_"> |
| 211 $i18n{confirm} | 215 $i18n{confirm} |
| 212 </paper-button> | 216 </paper-button> |
| 213 </div> | 217 </div> |
| 214 </dialog> | 218 </dialog> |
| 215 </template> | 219 </template> |
| 216 <script src="network_proxy.js"></script> | 220 <script src="network_proxy.js"></script> |
| 217 </dom-module> | 221 </dom-module> |
| OLD | NEW |