| 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/network/cr_onc_types.htm
l"> | 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
| 2 <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"> |
| 3 <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"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in
dicator.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in
dicator.html"> |
| 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 6 <link rel="import" href="chrome://resources/html/polymer.html"> | 7 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.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"> |
| 12 <link rel="import" href="/controls/settings_checkbox.html"> |
| 11 <link rel="import" href="/i18n_setup.html"> | 13 <link rel="import" href="/i18n_setup.html"> |
| 12 <link rel="import" href="/md_select_css.html"> | 14 <link rel="import" href="/md_select_css.html"> |
| 13 <link rel="import" href="/prefs/prefs_behavior.html"> | 15 <link rel="import" href="/prefs/prefs_behavior.html"> |
| 14 <link rel="import" href="internet_shared_css.html"> | 16 <link rel="import" href="internet_shared_css.html"> |
| 15 <link rel="import" href="network_proxy_exclusions.html"> | 17 <link rel="import" href="network_proxy_exclusions.html"> |
| 16 <link rel="import" href="network_proxy_input.html"> | 18 <link rel="import" href="network_proxy_input.html"> |
| 17 | 19 |
| 18 <dom-module id="network-proxy"> | 20 <dom-module id="network-proxy"> |
| 19 <template> | 21 <template> |
| 20 <style include="internet-shared md-select"> | 22 <style include="internet-shared md-select"> |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 <div>$i18n{networkProxyEnforcedPolicy}</div> | 62 <div>$i18n{networkProxyEnforcedPolicy}</div> |
| 61 </div> | 63 </div> |
| 62 <div class="layout horizontal center" | 64 <div class="layout horizontal center" |
| 63 hidden$="[[!getShowPrefPolicyIndicator_(networkProperties)]]"> | 65 hidden$="[[!getShowPrefPolicyIndicator_(networkProperties)]]"> |
| 64 <cr-policy-pref-indicator pref="[[prefs.proxy]]"> | 66 <cr-policy-pref-indicator pref="[[prefs.proxy]]"> |
| 65 </cr-policy-pref-indicator> | 67 </cr-policy-pref-indicator> |
| 66 <div>$i18n{networkProxyControlledExtension}</div> | 68 <div>$i18n{networkProxyControlledExtension}</div> |
| 67 </div> | 69 </div> |
| 68 </div> | 70 </div> |
| 69 | 71 |
| 72 <!-- Allow shared proxies --> |
| 73 <div class="settings-box continuation" |
| 74 hidden$="[[!getShowAllowShared_( |
| 75 networkProperties.ProxySettings.Type)]]"> |
| 76 <settings-checkbox id="allowShared" |
| 77 pref="{{prefs.settings.use_shared_proxies}}" |
| 78 no-set-pref label="$i18n{networkProxyAllowShared}" |
| 79 on-change="onAllowSharedProxiesChange_"> |
| 80 </settings-checkbox> |
| 81 </div> |
| 82 |
| 70 <!-- Proxy type dropdown --> | 83 <!-- Proxy type dropdown --> |
| 71 <div class="settings-box continuation"> | 84 <div class="settings-box continuation"> |
| 72 <div class="start">$i18n{networkProxyConnectionType}</div> | 85 <div class="start">$i18n{networkProxyConnectionType}</div> |
| 73 <div class="md-select-wrapper"> | 86 <div class="md-select-wrapper"> |
| 74 <select id="proxyType" class="md-select" on-change="onTypeChange_" | 87 <select id="proxyType" class="md-select" on-change="onTypeChange_" |
| 75 value="[[proxy.Type]]" | 88 value="[[proxy.Type]]" |
| 76 disabled="[[!isProxyEditable_(networkProperties, editable)]]"> | 89 disabled="[[!isProxyEditable_(networkProperties, editable, |
| 90 useSharedProxies_)]]"> |
| 77 <template is="dom-repeat" items="[[proxyTypes_]]"> | 91 <template is="dom-repeat" items="[[proxyTypes_]]"> |
| 78 <option value="[[item]]">[[getProxyTypeDesc_(item)]]</option> | 92 <option value="[[item]]">[[getProxyTypeDesc_(item)]]</option> |
| 79 </template> | 93 </template> |
| 80 </select> | 94 </select> |
| 81 <span class="md-select-underline"></span> | 95 <span class="md-select-underline"></span> |
| 82 </div> | 96 </div> |
| 83 </div> | 97 </div> |
| 84 | 98 |
| 85 <!-- Autoconfiguration (PAC) --> | 99 <!-- Autoconfiguration (PAC) --> |
| 86 <div class="settings-box continuation indent" | 100 <div class="settings-box continuation indent" |
| 87 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.PAC)]]"> | 101 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.PAC)]]"> |
| 88 <div>$i18n{networkProxyAutoConfig}</div> | 102 <div>$i18n{networkProxyAutoConfig}</div> |
| 89 <paper-input no-label-float class="middle" value="{{proxy.PAC}}" | 103 <paper-input no-label-float class="middle" value="{{proxy.PAC}}" |
| 90 disabled="[[!isEditable_(networkProperties.ProxySettings.PAC)]]" | 104 disabled="[[!isEditable_(networkProperties.ProxySettings.PAC, |
| 105 useSharedProxies_)]]" |
| 91 on-blur="onProxyInputChange_"> | 106 on-blur="onProxyInputChange_"> |
| 92 </paper-input> | 107 </paper-input> |
| 93 </div> | 108 </div> |
| 94 | 109 |
| 95 <!-- Web Proxy Auto Discovery (WPAD) --> | 110 <!-- Web Proxy Auto Discovery (WPAD) --> |
| 96 <div class="settings-box continuation indent" | 111 <div class="settings-box continuation indent" |
| 97 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.WPAD)]]"> | 112 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.WPAD)]]"> |
| 98 <div>$i18n{networkSectionWpad}</div> | 113 <div>$i18n{networkSectionWpad}</div> |
| 99 <div class="middle">[[WPAD]]</div> | 114 <div class="middle">[[WPAD]]</div> |
| 100 </div> | 115 </div> |
| 101 | 116 |
| 102 <!-- Manual --> | 117 <!-- Manual --> |
| 103 <div id="proxyDiv" class="settings-box continuation single-column indent" | 118 <div id="proxyDiv" class="settings-box continuation single-column indent" |
| 104 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.MANUAL)]]"> | 119 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.MANUAL)]]"> |
| 105 <paper-checkbox checked="{{useSameProxy_}}" | 120 <paper-checkbox checked="{{useSameProxy_}}" |
| 106 disabled="[[!isProxyEditable_(networkProperties, editable)]]"> | 121 disabled="[[!isProxyEditable_(networkProperties, editable, |
| 122 useSharedProxies_)]]"> |
| 107 $i18n{networkProxyUseSame} | 123 $i18n{networkProxyUseSame} |
| 108 </paper-checkbox> | 124 </paper-checkbox> |
| 109 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> | 125 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> |
| 110 <network-proxy-input | 126 <network-proxy-input |
| 111 on-proxy-change="onProxyInputChange_" | 127 on-proxy-change="onProxyInputChange_" |
| 112 editable="[[isEditable_( | 128 editable="[[isEditable_( |
| 113 networkProperties.ProxySettings.Manual.HTTPProxy.Host, | 129 networkProperties.ProxySettings.Manual.HTTPProxy.Host, |
| 114 editable)]]" | 130 editable, useSharedProxies_)]]" |
| 115 value="{{proxy.Manual.HTTPProxy}}" | 131 value="{{proxy.Manual.HTTPProxy}}" |
| 116 label="$i18n{networkProxy}"> | 132 label="$i18n{networkProxy}"> |
| 117 </network-proxy-input> | 133 </network-proxy-input> |
| 118 </div> | 134 </div> |
| 119 <div hidden$="[[useSameProxy_]]" class="layout vertical"> | 135 <div hidden$="[[useSameProxy_]]" class="layout vertical"> |
| 120 <network-proxy-input | 136 <network-proxy-input |
| 121 on-proxy-change="onProxyInputChange_" | 137 on-proxy-change="onProxyInputChange_" |
| 122 editable="[[isEditable_( | 138 editable="[[isEditable_( |
| 123 networkProperties.ProxySettings.Manual.HTTPProxy.Host, | 139 networkProperties.ProxySettings.Manual.HTTPProxy.Host, |
| 124 editable)]]" | 140 editable, useSharedProxies_)]]" |
| 125 value="{{proxy.Manual.HTTPProxy}}" | 141 value="{{proxy.Manual.HTTPProxy}}" |
| 126 label="$i18n{networkProxyHttp}"> | 142 label="$i18n{networkProxyHttp}"> |
| 127 </network-proxy-input> | 143 </network-proxy-input> |
| 128 <network-proxy-input | 144 <network-proxy-input |
| 129 on-proxy-change="onProxyInputChange_" | 145 on-proxy-change="onProxyInputChange_" |
| 130 editable="[[isEditable_( | 146 editable="[[isEditable_( |
| 131 networkProperties.ProxySettings.Manual.SecureHTTPProxy.Hos
t, | 147 networkProperties.ProxySettings.Manual.SecureHTTPProxy.Hos
t, |
| 132 editable)]]" | 148 editable, useSharedProxies_)]]" |
| 133 value="{{proxy.Manual.SecureHTTPProxy}}" | 149 value="{{proxy.Manual.SecureHTTPProxy}}" |
| 134 label="$i18n{networkProxyShttp}"> | 150 label="$i18n{networkProxyShttp}"> |
| 135 </network-proxy-input> | 151 </network-proxy-input> |
| 136 <network-proxy-input | 152 <network-proxy-input |
| 137 on-proxy-change="onProxyInputChange_" | 153 on-proxy-change="onProxyInputChange_" |
| 138 editable="[[isEditable_( | 154 editable="[[isEditable_( |
| 139 networkProperties.ProxySettings.Manual.FTPProxy.Host, | 155 networkProperties.ProxySettings.Manual.FTPProxy.Host, |
| 140 editable)]]" | 156 editable, useSharedProxies_)]]" |
| 141 value="{{proxy.Manual.FTPProxy}}" | 157 value="{{proxy.Manual.FTPProxy}}" |
| 142 label="$i18n{networkProxyFtp}"> | 158 label="$i18n{networkProxyFtp}"> |
| 143 </network-proxy-input> | 159 </network-proxy-input> |
| 144 <network-proxy-input | 160 <network-proxy-input |
| 145 on-proxy-change="onProxyInputChange_" | 161 on-proxy-change="onProxyInputChange_" |
| 146 editable="[[isEditable_( | 162 editable="[[isEditable_( |
| 147 networkProperties.ProxySettings.Manual.SOCKS.Host, | 163 networkProperties.ProxySettings.Manual.SOCKS.Host, |
| 148 editable)]]" | 164 editable, useSharedProxies_)]]" |
| 149 value="{{proxy.Manual.SOCKS}}" | 165 value="{{proxy.Manual.SOCKS}}" |
| 150 label="$i18n{networkProxySocks}"> | 166 label="$i18n{networkProxySocks}"> |
| 151 </network-proxy-input> | 167 </network-proxy-input> |
| 152 </div> | 168 </div> |
| 153 | 169 |
| 154 <div id="exceptionsDiv" | 170 <div id="exceptionsDiv" |
| 155 hidden="[[!isProxyEditable_(networkProperties, editable)]]"> | 171 hidden="[[!isProxyEditable_(networkProperties, editable, |
| 172 useSharedProxies_)]]"> |
| 156 <div>$i18n{networkProxyExceptionList}</div> | 173 <div>$i18n{networkProxyExceptionList}</div> |
| 157 <network-proxy-exclusions on-proxy-change="onProxyExclusionsChange_" | 174 <network-proxy-exclusions on-proxy-change="onProxyExclusionsChange_" |
| 158 exclusions="{{proxy.ExcludeDomains}}"> | 175 exclusions="{{proxy.ExcludeDomains}}"> |
| 159 </network-proxy-exclusions> | 176 </network-proxy-exclusions> |
| 160 <div class="layout horizontal"> | 177 <div class="layout horizontal"> |
| 161 <paper-input-container no-label-float class="flex"> | 178 <paper-input-container no-label-float class="flex"> |
| 162 <input id="proxyExclusion" is="iron-input"> | 179 <input id="proxyExclusion" is="iron-input"> |
| 163 </paper-input-container> | 180 </paper-input-container> |
| 164 <paper-button on-tap="onAddProxyExclusionTap_"> | 181 <paper-button on-tap="onAddProxyExclusionTap_"> |
| 165 $i18n{networkProxyAddException} | 182 $i18n{networkProxyAddException} |
| 166 </paper-button> | 183 </paper-button> |
| 167 </div> | 184 </div> |
| 168 </div> | 185 </div> |
| 169 </div> | 186 </div> |
| 187 |
| 188 <!-- Confirm Allow shared proxies dialog --> |
| 189 <dialog is="cr-dialog" id="confirmAllowSharedDialog" |
| 190 on-cancel="onAllowSharedDialogCancel_"> |
| 191 <div class="title">$i18n{networkProxyAllowSharedWarningTitle}</div> |
| 192 <div class="body">$i18n{networkProxyAllowSharedWarningMessage}</div> |
| 193 <div class="button-container"> |
| 194 <paper-button class="cancel-button" |
| 195 on-tap="onAllowSharedDialogCancel_"> |
| 196 $i18n{cancel} |
| 197 </paper-button> |
| 198 <paper-button class="action-button" |
| 199 on-tap="onAllowSharedDialogConfirm_"> |
| 200 $i18n{confirm} |
| 201 </paper-button> |
| 202 </div> |
| 203 </dialog> |
| 170 </template> | 204 </template> |
| 171 <script src="network_proxy.js"></script> | 205 <script src="network_proxy.js"></script> |
| 172 </dom-module> | 206 </dom-module> |
| OLD | NEW |