| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/paper-styl
es.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/paper-styl
es.html"> |
| 5 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_input/cr_input.h
tml"> | |
| 6 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_type
s.html"> | 6 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_type
s.html"> |
| 7 <link rel="import" href="network_property_list.html"> | 7 <link rel="import" href="network_property_list.html"> |
| 8 <link rel="import" href="network_proxy_input.html"> | 8 <link rel="import" href="network_proxy_input.html"> |
| 9 <link rel="import" href="network_proxy_exclusions.html"> | 9 <link rel="import" href="network_proxy_exclusions.html"> |
| 10 | 10 |
| 11 <dom-module id="network-proxy"> | 11 <dom-module id="network-proxy"> |
| 12 <link rel="import" type="css" href="network_proxy.css"> | 12 <link rel="import" type="css" href="network_proxy.css"> |
| 13 <template> | 13 <template> |
| 14 <div id="outer" class="layout vertical flex"> | 14 <div id="outer" class="layout vertical flex"> |
| 15 <!-- TODO(stevenjb): Use cr-dropdown-menu once available. --> | 15 <!-- TODO(stevenjb): Use cr-dropdown-menu once available. --> |
| 16 <div> | 16 <div> |
| 17 <select id="selectType" on-change="onTypeChange_"> | 17 <select id="selectType" on-change="onTypeChange_"> |
| 18 <template is="dom-repeat" items="[[proxyTypes_]]"> | 18 <template is="dom-repeat" items="[[proxyTypes_]]"> |
| 19 <option value="[[item]]">[[proxyTypeDesc_(item)]]</option> | 19 <option value="[[item]]">[[proxyTypeDesc_(item)]]</option> |
| 20 </template> | 20 </template> |
| 21 </select> | 21 </select> |
| 22 </div> | 22 </div> |
| 23 | 23 |
| 24 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]" | 24 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]" |
| 25 class="layout horizontal"> | 25 class="layout horizontal"> |
| 26 <span>Autoconfiguration URL:</span> | 26 <span>Autoconfiguration URL:</span> |
| 27 <cr-input no-label-float class="flex" value="{{proxy.PAC}}" | 27 <paper-input no-label-float class="flex" value="{{proxy.PAC}}" |
| 28 on-blur="onProxyInputChange_"> | 28 on-blur="onProxyInputChange_"> |
| 29 </cr-input> | 29 </paper-input> |
| 30 </div> | 30 </div> |
| 31 | 31 |
| 32 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]" | 32 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]" |
| 33 class="layout horizontal"> | 33 class="layout horizontal"> |
| 34 <span>Web Proxy Auto Discovery URL:</span><span>[[WPAD]]</span> | 34 <span>Web Proxy Auto Discovery URL:</span><span>[[WPAD]]</span> |
| 35 </div> | 35 </div> |
| 36 | 36 |
| 37 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]" | 37 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]" |
| 38 class="layout vertical"> | 38 class="layout vertical"> |
| 39 <paper-checkbox id="useUrl" checked="{{useSameProxy}}"> | 39 <paper-checkbox id="useUrl" checked="{{useSameProxy}}"> |
| (...skipping 22 matching lines...) Expand all Loading... |
| 62 value="{{proxy.Manual.SOCKS}}" | 62 value="{{proxy.Manual.SOCKS}}" |
| 63 label="SOCKS host" on-proxy-change="onProxyInputChange_"> | 63 label="SOCKS host" on-proxy-change="onProxyInputChange_"> |
| 64 </network-proxy-input> | 64 </network-proxy-input> |
| 65 </div> | 65 </div> |
| 66 | 66 |
| 67 <span>Do not use the proxy settings for these hosts and domains:</span> | 67 <span>Do not use the proxy settings for these hosts and domains:</span> |
| 68 <network-proxy-exclusions exclusions="{{proxy.ExcludeDomains}}" | 68 <network-proxy-exclusions exclusions="{{proxy.ExcludeDomains}}" |
| 69 on-proxy-change="onProxyExclusionsChange_"> | 69 on-proxy-change="onProxyExclusionsChange_"> |
| 70 </network-proxy-exclusions> | 70 </network-proxy-exclusions> |
| 71 <div class="layout horizontal baseline"> | 71 <div class="layout horizontal baseline"> |
| 72 <cr-input id="proxyExclusion" class="flex" no-label-float> | 72 <paper-input id="proxyExclusion" class="flex" no-label-float> |
| 73 </cr-input> | 73 </paper-input> |
| 74 <paper-button on-tap="onAddProxyExclusion_"> | 74 <paper-button on-tap="onAddProxyExclusion_"> |
| 75 Add Exception | 75 Add Exception |
| 76 </paper-button> | 76 </paper-button> |
| 77 </div> | 77 </div> |
| 78 </div> | 78 </div> |
| 79 </div> | 79 </div> |
| 80 </template> | 80 </template> |
| 81 <script src="network_proxy.js"></script> | 81 <script src="network_proxy.js"></script> |
| 82 </dom-module> | 82 </dom-module> |
| OLD | NEW |