Chromium Code Reviews| 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"> | |
|
michaelpg
2015/09/24 19:42:14
y? https://code.google.com/p/chromium/codesearch#c
stevenjb
2015/09/24 19:59:59
Merge bug. Restored.
| |
| 7 <link rel="import" href="network_property_list.html"> | 6 <link rel="import" href="network_property_list.html"> |
| 8 <link rel="import" href="network_proxy_input.html"> | 7 <link rel="import" href="network_proxy_input.html"> |
| 9 <link rel="import" href="network_proxy_exclusions.html"> | 8 <link rel="import" href="network_proxy_exclusions.html"> |
| 10 | 9 |
| 11 <dom-module id="network-proxy"> | 10 <dom-module id="network-proxy"> |
| 12 <link rel="import" type="css" href="network_proxy.css"> | 11 <link rel="import" type="css" href="network_proxy.css"> |
| 13 <template> | 12 <template> |
| 14 <div id="outer" class="layout vertical flex"> | 13 <div id="outer" class="layout vertical flex"> |
| 15 <!-- TODO(stevenjb): Use cr-dropdown-menu once available. --> | 14 <!-- TODO(stevenjb): Use cr-dropdown-menu once available. --> |
| 16 <div> | 15 <div> |
| 17 <select id="selectType" on-change="onTypeChange_"> | 16 <select id="selectType" on-change="onTypeChange_"> |
| 18 <template is="dom-repeat" items="[[proxyTypes_]]"> | 17 <template is="dom-repeat" items="[[proxyTypes_]]"> |
| 19 <option value="[[item]]">[[proxyTypeDesc_(item)]]</option> | 18 <option value="[[item]]">[[proxyTypeDesc_(item)]]</option> |
| 20 </template> | 19 </template> |
| 21 </select> | 20 </select> |
| 22 </div> | 21 </div> |
| 23 | 22 |
| 24 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]" | 23 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]" |
| 25 class="layout horizontal"> | 24 class="layout horizontal"> |
| 26 <span>Autoconfiguration URL:</span> | 25 <span>Autoconfiguration URL:</span> |
| 27 <cr-input no-label-float class="flex" value="{{proxy.PAC}}" | 26 <paper-input no-label-float class="flex" value="{{proxy.PAC}}" |
| 28 on-blur="onProxyInputChange_"> | 27 on-blur="onProxyInputChange_"> |
| 29 </cr-input> | 28 </paper-input> |
| 30 </div> | 29 </div> |
| 31 | 30 |
| 32 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]" | 31 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]" |
| 33 class="layout horizontal"> | 32 class="layout horizontal"> |
| 34 <span>Web Proxy Auto Discovery URL:</span><span>[[WPAD]]</span> | 33 <span>Web Proxy Auto Discovery URL:</span><span>[[WPAD]]</span> |
| 35 </div> | 34 </div> |
| 36 | 35 |
| 37 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]" | 36 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]" |
| 38 class="layout vertical"> | 37 class="layout vertical"> |
| 39 <paper-checkbox id="useUrl" checked="{{useSameProxy}}"> | 38 <paper-checkbox id="useUrl" checked="{{useSameProxy}}"> |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 62 value="{{proxy.Manual.SOCKS}}" | 61 value="{{proxy.Manual.SOCKS}}" |
| 63 label="SOCKS host" on-proxy-change="onProxyInputChange_"> | 62 label="SOCKS host" on-proxy-change="onProxyInputChange_"> |
| 64 </network-proxy-input> | 63 </network-proxy-input> |
| 65 </div> | 64 </div> |
| 66 | 65 |
| 67 <span>Do not use the proxy settings for these hosts and domains:</span> | 66 <span>Do not use the proxy settings for these hosts and domains:</span> |
| 68 <network-proxy-exclusions exclusions="{{proxy.ExcludeDomains}}" | 67 <network-proxy-exclusions exclusions="{{proxy.ExcludeDomains}}" |
| 69 on-proxy-change="onProxyExclusionsChange_"> | 68 on-proxy-change="onProxyExclusionsChange_"> |
| 70 </network-proxy-exclusions> | 69 </network-proxy-exclusions> |
| 71 <div class="layout horizontal baseline"> | 70 <div class="layout horizontal baseline"> |
| 72 <cr-input id="proxyExclusion" class="flex" no-label-float> | 71 <paper-input id="proxyExclusion" class="flex" no-label-float> |
| 73 </cr-input> | 72 </paper-input> |
| 74 <paper-button on-tap="onAddProxyExclusion_"> | 73 <paper-button on-tap="onAddProxyExclusion_"> |
| 75 Add Exception | 74 Add Exception |
| 76 </paper-button> | 75 </paper-button> |
| 77 </div> | 76 </div> |
| 78 </div> | 77 </div> |
| 79 </div> | 78 </div> |
| 80 </template> | 79 </template> |
| 81 <script src="network_proxy.js"></script> | 80 <script src="network_proxy.js"></script> |
| 82 </dom-module> | 81 </dom-module> |
| OLD | NEW |