| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> | 1 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> |
| 4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap
er-dropdown-menu-light.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap
er-dropdown-menu-light.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
-container.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
-container.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> |
| 10 <link rel="import" href="internet_shared_css.html"> | 10 <link rel="import" href="internet_shared_css.html"> |
| 11 <link rel="import" href="network_property_list.html"> | 11 <link rel="import" href="network_property_list.html"> |
| 12 <link rel="import" href="network_proxy_exclusions.html"> | 12 <link rel="import" href="network_proxy_exclusions.html"> |
| 13 <link rel="import" href="network_proxy_input.html"> | 13 <link rel="import" href="network_proxy_input.html"> |
| 14 | 14 |
| 15 <dom-module id="network-proxy"> | 15 <dom-module id="network-proxy"> |
| 16 <template> | 16 <template> |
| 17 <style include="internet-shared"> | 17 <style include="internet-shared"> |
| 18 cr-policy-network-indicator { | 18 cr-policy-network-indicator { |
| 19 -webkit-margin-end: 10px; | 19 -webkit-margin-end: 10px; |
| 20 } | 20 } |
| 21 | 21 |
| 22 network-proxy-input { | 22 network-proxy-input { |
| 23 margin-bottom: 10px; | 23 margin-bottom: 10px; |
| 24 } | 24 } |
| 25 | 25 |
| 26 /* Use .middle spacing but no flex. */ |
| 27 .settings-box .middle { |
| 28 flex: none; |
| 29 } |
| 30 |
| 26 #exceptionsDiv { | 31 #exceptionsDiv { |
| 27 padding: 10px 0; | 32 padding: 10px 0; |
| 28 } | 33 } |
| 29 | 34 |
| 30 #exceptionsDiv network-proxy-exclusions { | 35 #exceptionsDiv network-proxy-exclusions { |
| 31 margin: 10px 0; | 36 margin: 10px 0; |
| 32 } | 37 } |
| 33 | 38 |
| 34 #proxyDiv paper-checkbox { | 39 #proxyDiv paper-checkbox { |
| 35 padding: 10px 0; | 40 padding: 10px 0; |
| (...skipping 20 matching lines...) Expand all Loading... |
| 56 <template is="dom-repeat" items="[[proxyTypes_]]"> | 61 <template is="dom-repeat" items="[[proxyTypes_]]"> |
| 57 <button class="dropdown-item" role="option" value="[[item]]"> | 62 <button class="dropdown-item" role="option" value="[[item]]"> |
| 58 [[proxyTypeDesc_(item)]] | 63 [[proxyTypeDesc_(item)]] |
| 59 </button> | 64 </button> |
| 60 </template> | 65 </template> |
| 61 </paper-listbox> | 66 </paper-listbox> |
| 62 </paper-dropdown-menu-light> | 67 </paper-dropdown-menu-light> |
| 63 </div> | 68 </div> |
| 64 | 69 |
| 65 <!-- Autoconfiguration (PAC) --> | 70 <!-- Autoconfiguration (PAC) --> |
| 66 <div class="settings-box continuation indented" | 71 <div class="settings-box continuation" |
| 67 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.PAC)]]"> | 72 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.PAC)]]"> |
| 68 <div class="start">$i18n{networkProxyAutoConfig}</div> | 73 <div>$i18n{networkProxyAutoConfig}</div> |
| 69 <paper-input no-label-float class="flex" value="{{proxy.PAC}}" | 74 <paper-input no-label-float class="middle" value="{{proxy.PAC}}" |
| 70 disabled="[[isNetworkPolicyEnforced( | 75 disabled="[[isNetworkPolicyEnforced( |
| 71 networkProperties.ProxySettings.PAC)]]" | 76 networkProperties.ProxySettings.PAC)]]" |
| 72 on-blur="onProxyInputChange_"> | 77 on-blur="onProxyInputChange_"> |
| 73 </paper-input> | 78 </paper-input> |
| 74 </div> | 79 </div> |
| 75 | 80 |
| 76 <!-- Web Proxy Auto Discovery (WPAD) --> | 81 <!-- Web Proxy Auto Discovery (WPAD) --> |
| 77 <div class="settings-box continuation indented" | 82 <div class="settings-box continuation" |
| 78 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.WPAD)]]"> | 83 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.WPAD)]]"> |
| 79 <div class="start">$i18n{networkSectionWpad}</div> | 84 <div>$i18n{networkSectionWpad}</div> |
| 80 <div>[[WPAD]]</div> | 85 <div class="middle">[[WPAD]]</div> |
| 81 </div> | 86 </div> |
| 82 | 87 |
| 83 <!-- Manual --> | 88 <!-- Manual --> |
| 84 <div id="proxyDiv" class="settings-box continuation single-column indented" | 89 <div id="proxyDiv" class="settings-box continuation single-column" |
| 85 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.MANUAL)]]"> | 90 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.MANUAL)]]"> |
| 86 <paper-checkbox checked="{{useSameProxy_}}"> | 91 <paper-checkbox checked="{{useSameProxy_}}"> |
| 87 $i18n{networkProxyUseSame} | 92 $i18n{networkProxyUseSame} |
| 88 </paper-checkbox> | 93 </paper-checkbox> |
| 89 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> | 94 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> |
| 90 <network-proxy-input | 95 <network-proxy-input |
| 91 on-proxy-change="onProxyInputChange_" | 96 on-proxy-change="onProxyInputChange_" |
| 92 editable="[[isPropertyEditable_(editable, networkProperties, | 97 editable="[[isPropertyEditable_(editable, networkProperties, |
| 93 'ProxySettings.Manual.HTTPProxy')]]" | 98 'ProxySettings.Manual.HTTPProxy')]]" |
| 94 value="{{proxy.Manual.HTTPProxy}}" | 99 value="{{proxy.Manual.HTTPProxy}}" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 </paper-input-container> | 142 </paper-input-container> |
| 138 <paper-button on-tap="onAddProxyExclusionTap_"> | 143 <paper-button on-tap="onAddProxyExclusionTap_"> |
| 139 $i18n{networkProxyAddException} | 144 $i18n{networkProxyAddException} |
| 140 </paper-button> | 145 </paper-button> |
| 141 </div> | 146 </div> |
| 142 </div> | 147 </div> |
| 143 </div> | 148 </div> |
| 144 </template> | 149 </template> |
| 145 <script src="network_proxy.js"></script> | 150 <script src="network_proxy.js"></script> |
| 146 </dom-module> | 151 </dom-module> |
| OLD | NEW |