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

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« chrome/browser/resources/settings/internet_page/internet_detail_page.js ('K') | « 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

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

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

	11 <template>

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

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

	14 <div>

	15 <select id="selectType" on-change="onTypeChange_">

	16 <template is="dom-repeat" items="[[proxyTypes_]]">

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

	18 </template>

	19 </select>

	20 </div>

	21

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

	23 class="layout horizontal">

	24 <span>Autoconfiguration URL:</span>

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

	26 on-change="onProxyInputChange_">
	stevenjb 2015/07/08 01:59:25 test test
	27 </cr-input>

	28 </div>

	29

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

	31 class="layout horizontal">

	32 <span>Web Proxy Auto Discovery URL:</span><span>[[WPAD]]</span>
	stevenjb 2015/07/08 01:59:25 Set WPAD from ipconfig Set WPAD from ipconfig
	33 </div>

	34

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

	36 class="layout vertical">

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

	38 Use the same proxy for all protocols

	39 </cr-checkbox>

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

	41 <network-proxy-input value="{{proxy.Manual.HTTPProxy}}"

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

	43 </network-proxy-input>

	44 </div>

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

	46 <network-proxy-input value="{{proxy.Manual.HTTPProxy}}"

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

	48 </network-proxy-input>

	49 <network-proxy-input value="{{proxy.Manual.SecureHTTPProxy}}"

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

	51 </network-proxy-input>

	52 <network-proxy-input value="{{proxy.Manual.FTPProxy}}"

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

	54 </network-proxy-input>

	55 <network-proxy-input value="{{proxy.Manual.SOCKS}}"

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

	57 </network-proxy-input>

	58 </div>

	59 </div>

	60 </div>

	61 </template>

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

	63 </dom-module>

OLD	NEW