Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(367)

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

Issue 1390073006: Add cr-policy-network-indicator to internet pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_521791_network_indicators_c3
Patch Set: Formatting fixes Created 5 years, 2 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
OLDNEW
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-input/paper-input .html">
5 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html">
7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
6 <link rel="import" href="network_property_list.html"> 8 <link rel="import" href="network_property_list.html">
7 <link rel="import" href="network_proxy_input.html"> 9 <link rel="import" href="network_proxy_input.html">
8 <link rel="import" href="network_proxy_exclusions.html"> 10 <link rel="import" href="network_proxy_exclusions.html">
9 11
10 <dom-module id="network-proxy"> 12 <dom-module id="network-proxy">
11 <link rel="import" type="css" href="network_proxy.css"> 13 <link rel="import" type="css" href="network_proxy.css">
12 <template> 14 <template>
13 <div id="outer" class="layout vertical flex"> 15 <div id="outer" class="layout vertical flex">
14 <!-- TODO(stevenjb): Use cr-dropdown-menu once available. --> 16 <!-- TODO(stevenjb): Use cr-dropdown-menu once available. -->
15 <div id="selectDiv"> 17 <div class="layout horizontal center" hidden$=
16 <select id="selectType" on-change="onTypeChange_"> 18 "[[!isNetworkPolicyControlled(networkProperties.ProxySettings.Type)]]" >
19 <cr-policy-network-indicator
20 property="[[networkProperties.ProxySettings.Type]]">
21 </cr-policy-network-indicator>
22 <span>This proxy is enforced by your administrator.</span>
23 </div>
24
25 <div id="selectTypeDiv">
26 <select id="selectType" on-change="onTypeChange_"
27 disabled$="[[isNetworkPolicyEnforced(networkProperties.ProxySettings .Type)]]">
17 <template is="dom-repeat" items="[[proxyTypes_]]"> 28 <template is="dom-repeat" items="[[proxyTypes_]]">
18 <option value="[[item]]">[[proxyTypeDesc_(item)]]</option> 29 <option value="[[item]]">[[proxyTypeDesc_(item)]]</option>
19 </template> 30 </template>
20 </select> 31 </select>
21 </div> 32 </div>
22 33
23 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]" 34 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]"
24 class="layout horizontal"> 35 class="layout horizontal">
25 <span>Autoconfiguration URL:</span> 36 <span>Autoconfiguration URL:</span>
26 <paper-input no-label-float class="flex" value="{{proxy.PAC}}" 37 <paper-input no-label-float class="flex" value="{{proxy.PAC}}"
38 disabled="[[isNetworkPolicyEnforced(networkProperties.ProxySettings. PAC)]]">
27 on-blur="onProxyInputChange_"> 39 on-blur="onProxyInputChange_">
28 </paper-input> 40 </paper-input>
29 </div> 41 </div>
30 42
31 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]" 43 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.WPAD)]]"
32 class="layout horizontal"> 44 class="layout horizontal">
33 <span>Web Proxy Auto Discovery URL:</span><span>[[WPAD]]</span> 45 <span>Web Proxy Auto Discovery URL:</span><span>[[WPAD]]</span>
34 </div> 46 </div>
35 47
36 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]" 48 <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]"
37 class="layout vertical"> 49 class="layout vertical">
38 <paper-checkbox id="useUrl" checked="{{useSameProxy}}"> 50 <paper-checkbox id="useUrl" checked="{{useSameProxy}}">
39 Use the same proxy for all protocols 51 Use the same proxy for all protocols
40 </paper-checkbox> 52 </paper-checkbox>
41 <div hidden$="[[!useSameProxy]]" class="layout vertical"> 53 <div hidden$="[[!useSameProxy]]" class="layout vertical">
42 <network-proxy-input editable="[[editable]]" 54 <network-proxy-input
55 editable="[[isPropertyEditable_(editable, networkProperties, 'Prox ySettings.Manual.HTTPProxy')]]"
43 value="{{proxy.Manual.HTTPProxy}}" 56 value="{{proxy.Manual.HTTPProxy}}"
44 label="Proxy" on-proxy-change="onProxyInputChange_"> 57 label="Proxy" on-proxy-change="onProxyInputChange_">
45 </network-proxy-input> 58 </network-proxy-input>
46 </div> 59 </div>
47 <div hidden$="[[useSameProxy]]" class="layout vertical"> 60 <div hidden$="[[useSameProxy]]" class="layout vertical">
48 <network-proxy-input editable="[[editable]]" 61 <network-proxy-input
62 editable="[[isPropertyEditable_(editable, networkProperties, 'Prox ySettings.Manual.HTTPProxy)')]]"
49 value="{{proxy.Manual.HTTPProxy}}" 63 value="{{proxy.Manual.HTTPProxy}}"
50 label="HTTP Proxy" on-proxy-change="onProxyInputChange_"> 64 label="HTTP Proxy" on-proxy-change="onProxyInputChange_">
51 </network-proxy-input> 65 </network-proxy-input>
52 <network-proxy-input editable="[[editable]]" 66 <network-proxy-input
67 editable="[[isPropertyEditable_(editable, networkProperties, 'Prox ySettings.Manual.SecureHTTPProxy)')]]"
53 value="{{proxy.Manual.SecureHTTPProxy}}" 68 value="{{proxy.Manual.SecureHTTPProxy}}"
54 label="Secure HTTP Proxy" on-proxy-change="onProxyInputChange_"> 69 label="Secure HTTP Proxy" on-proxy-change="onProxyInputChange_">
55 </network-proxy-input> 70 </network-proxy-input>
56 <network-proxy-input editable="[[editable]]" 71 <network-proxy-input
72 editable="[[isPropertyEditable_(editable, networkProperties, 'Prox ySettings.Manual.FTPProxy)')]]"
57 value="{{proxy.Manual.FTPProxy}}" 73 value="{{proxy.Manual.FTPProxy}}"
58 label="FTP Proxy" on-proxy-change="onProxyInputChange_"> 74 label="FTP Proxy" on-proxy-change="onProxyInputChange_">
59 </network-proxy-input> 75 </network-proxy-input>
60 <network-proxy-input editable="[[editable]]" 76 <network-proxy-input
77 editable="[[isPropertyEditable_(editable, networkProperties, 'Prox ySettings.Manual.SOCKS)')]]"
61 value="{{proxy.Manual.SOCKS}}" 78 value="{{proxy.Manual.SOCKS}}"
62 label="SOCKS host" on-proxy-change="onProxyInputChange_"> 79 label="SOCKS host" on-proxy-change="onProxyInputChange_">
63 </network-proxy-input> 80 </network-proxy-input>
64 </div> 81 </div>
65 82
66 <span>Do not use the proxy settings for these hosts and domains:</span> 83 <span>Do not use the proxy settings for these hosts and domains:</span>
67 <network-proxy-exclusions exclusions="{{proxy.ExcludeDomains}}" 84 <network-proxy-exclusions exclusions="{{proxy.ExcludeDomains}}"
68 on-proxy-change="onProxyExclusionsChange_"> 85 on-proxy-change="onProxyExclusionsChange_">
69 </network-proxy-exclusions> 86 </network-proxy-exclusions>
70 <div class="layout horizontal baseline"> 87 <div class="layout horizontal baseline">
71 <paper-input id="proxyExclusion" class="flex" no-label-float> 88 <paper-input id="proxyExclusion" class="flex" no-label-float>
72 </paper-input> 89 </paper-input>
73 <paper-button on-tap="onAddProxyExclusionTap_"> 90 <paper-button on-tap="onAddProxyExclusionTap_">
74 Add Exception 91 Add Exception
75 </paper-button> 92 </paper-button>
76 </div> 93 </div>
77 </div> 94 </div>
78 </div> 95 </div>
79 </template> 96 </template>
80 <script src="network_proxy.js"></script> 97 <script src="network_proxy.js"></script>
81 </dom-module> 98 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698