chrome/browser/resources/settings/internet_page/network_proxy.html - Issue 1219753007: Add network proxy input to md-settings internet details

Side by Side Diff: chrome/browser/resources/settings/internet_page/network_proxy.html

Issue 1219753007: Add network proxy input to md-settings internet details (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_470445_onc_proxy

Patch Set: . Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/resources/settings/internet_page/network_proxy.css ('k') | chrome/browser/resources/settings/internet_page/network_proxy.js » ('j') | chrome/browser/resources/settings/internet_page/network_proxy.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

	2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/paper-styl es.html">

	3 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_chec kbox.html">

	4 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_input/cr_input.h tml">

	5 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_onc/cr_onc_types .html">

	6 <link rel="import" href="network_property_list.html">

	7 <link rel="import" href="network_proxy_input.html">

	8 <link rel="import" href="network_proxy_exclusions.html">

	9

	10 <dom-module id="network-proxy">

	11 <link rel="import" type="css" href="network_proxy.css">

	12 <template>

	13 <div id="outer" class="layout vertical flex">

	14 <!-- TODO(stevenjb): Use cr-dropdown-menu once available. -->

	15 <div>

	16 <select id="selectType" on-change="onTypeChange_">
	michaelpg 2015/07/10 00:38:30 nit: onTypeSelected, not to be confused with a typ nit: onTypeSelected, not to be confused with a type property observer. stevenjb 2015/07/10 17:31:59 Yeah, but it's an on-change event. I don't disagre Show quoted text On 2015/07/10 00:38:30, michaelpg wrote: > nit: onTypeSelected, not to be confused with a type property observer. Yeah, but it's an on-change event. I don't disagreee that it's confusing, but I think it's confusing either way. And DGMS on on-change vs. on-changed. For now I am trying to match the method name to the event.
	17 <template is="dom-repeat" items="[[proxyTypes_]]">

	18 <option value="[[item]]">[[proxyTypeDesc_(item)]]</option>

	19 </template>

	20 </select>

	21 </div>

	22

	23 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]"

	24 class="layout horizontal">

	25 <span>Autoconfiguration URL:</span>

	26 <cr-input no-label-float class="flex" value="{{proxy.PAC}}"

	27 on-blur="onProxyInputChanged_">

	28 </cr-input>

	29 </div>

	30

	31 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]"

	32 class="layout horizontal">

	33 <span>Web Proxy Auto Discovery URL:</span><span>[[WPAD]]</span>

	34 </div>

	35

	36 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]"

	37 class="layout vertical">

	38 <cr-checkbox id="useUrl" checked="{{useSameProxy}}">

	39 Use the same proxy for all protocols

	40 </cr-checkbox>

	41 <div hidden$="[[!useSameProxy]]" class="layout vertical">

	42 <network-proxy-input editable="[[editable]]"

	43 value="{{proxy.Manual.HTTPProxy}}"

	44 label="Proxy" on-changed="onProxyInputChanged_">

	45 </network-proxy-input>

	46 </div>

	47 <div hidden$="[[useSameProxy]]" class="layout vertical">

	48 <network-proxy-input editable="[[editable]]"

	49 value="{{proxy.Manual.HTTPProxy}}"

	50 label="HTTP Proxy" on-changed="onProxyInputChanged_">

	51 </network-proxy-input>

	52 <network-proxy-input editable="[[editable]]"

	53 value="{{proxy.Manual.SecureHTTPProxy}}"

	54 label="Secure HTTP Proxy" on-changed="onProxyInputChanged_">

	55 </network-proxy-input>

	56 <network-proxy-input editable="[[editable]]"

	57 value="{{proxy.Manual.FTPProxy}}"

	58 label="FTP Proxy" on-changed="onProxyInputChanged_">

	59 </network-proxy-input>

	60 <network-proxy-input editable="[[editable]]"

	61 value="{{proxy.Manual.SOCKS}}"

	62 label="SOCKS host" on-changed="onProxyInputChanged_">

	63 </network-proxy-input>

	64 </div>

	65

	66 <span>Do not use the proxy settings for these hosts and domains:</span>

	67 <network-proxy-exclusions exclusions="[[proxy.ExcludeDomains]]"

	68 on-removed="onRemoveProxyExclusion_">

	69 </network-proxy-exclusions>

	70 <div class="layout horizontal baseline">

	71 <cr-input id="proxyExclusion" class="flex" no-label-float>

	72 </cr-input>

	73 <cr-button on-click="onAddProxyExclusion_">

	74 Add Exception

	75 </cr-button>

	76 </div>

	77 </div>

	78 </div>

	79 </template>

	80 <script src="network_proxy.js"></script>

	81 </dom-module>

OLD	NEW