| 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"> | |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
-container.html"> | 7 <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"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> |
| 9 <link rel="import" href="/md_select_css.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_proxy_exclusions.html"> | 11 <link rel="import" href="network_proxy_exclusions.html"> |
| 12 <link rel="import" href="network_proxy_input.html"> | 12 <link rel="import" href="network_proxy_input.html"> |
| 13 | 13 |
| 14 <dom-module id="network-proxy"> | 14 <dom-module id="network-proxy"> |
| 15 <template> | 15 <template> |
| 16 <style include="internet-shared"> | 16 <style include="internet-shared md-select"> |
| 17 cr-policy-network-indicator { | 17 cr-policy-network-indicator { |
| 18 -webkit-margin-end: 10px; | 18 -webkit-margin-end: 10px; |
| 19 } | 19 } |
| 20 | 20 |
| 21 network-proxy-input { | 21 network-proxy-input { |
| 22 margin-bottom: 10px; | 22 margin-bottom: 10px; |
| 23 } | 23 } |
| 24 | 24 |
| 25 /* Use .middle spacing but no flex. */ | 25 /* Use .middle spacing but no flex. */ |
| 26 .settings-box .middle { | 26 .settings-box .middle { |
| (...skipping 20 matching lines...) Expand all Loading... |
| 47 <cr-policy-network-indicator | 47 <cr-policy-network-indicator |
| 48 property="[[networkProperties.ProxySettings.Type]]"> | 48 property="[[networkProperties.ProxySettings.Type]]"> |
| 49 </cr-policy-network-indicator> | 49 </cr-policy-network-indicator> |
| 50 <div>$i18n{networkProxyEnforced}</div> | 50 <div>$i18n{networkProxyEnforced}</div> |
| 51 </div> | 51 </div> |
| 52 </div> | 52 </div> |
| 53 | 53 |
| 54 <!-- Proxy type dropdown --> | 54 <!-- Proxy type dropdown --> |
| 55 <div class="settings-box continuation"> | 55 <div class="settings-box continuation"> |
| 56 <div class="start">$i18n{networkProxyConnectionType}</div> | 56 <div class="start">$i18n{networkProxyConnectionType}</div> |
| 57 <paper-dropdown-menu-light vertical-align="auto" no-label-float> | 57 <div class="md-select-wrapper"> |
| 58 <paper-listbox class="dropdown-content" on-iron-activate="onTypeChange_" | 58 <select id="proxyType" class="md-select" on-change="onTypeChange_" |
| 59 selected="[[proxy.Type]]" attr-for-selected="value"> | 59 value="[[proxy.Type]]"> |
| 60 <template is="dom-repeat" items="[[proxyTypes_]]"> | 60 <template is="dom-repeat" items="[[proxyTypes_]]"> |
| 61 <button class="dropdown-item" role="option" value="[[item]]"> | 61 <option value="[[item]]">[[proxyTypeDesc_(item)]]</option> |
| 62 [[proxyTypeDesc_(item)]] | |
| 63 </button> | |
| 64 </template> | 62 </template> |
| 65 </paper-listbox> | 63 </select> |
| 66 </paper-dropdown-menu-light> | 64 <span class="md-select-underline"></span> |
| 65 </div> |
| 67 </div> | 66 </div> |
| 68 | 67 |
| 69 <!-- Autoconfiguration (PAC) --> | 68 <!-- Autoconfiguration (PAC) --> |
| 70 <div class="settings-box continuation" | 69 <div class="settings-box continuation" |
| 71 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.PAC)]]"> | 70 hidden$="[[!matches_(proxy.Type, ProxySettingsType_.PAC)]]"> |
| 72 <div>$i18n{networkProxyAutoConfig}</div> | 71 <div>$i18n{networkProxyAutoConfig}</div> |
| 73 <paper-input no-label-float class="middle" value="{{proxy.PAC}}" | 72 <paper-input no-label-float class="middle" value="{{proxy.PAC}}" |
| 74 disabled="[[isNetworkPolicyEnforced( | 73 disabled="[[isNetworkPolicyEnforced( |
| 75 networkProperties.ProxySettings.PAC)]]" | 74 networkProperties.ProxySettings.PAC)]]" |
| 76 on-blur="onProxyInputChange_"> | 75 on-blur="onProxyInputChange_"> |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 </paper-input-container> | 140 </paper-input-container> |
| 142 <paper-button on-tap="onAddProxyExclusionTap_"> | 141 <paper-button on-tap="onAddProxyExclusionTap_"> |
| 143 $i18n{networkProxyAddException} | 142 $i18n{networkProxyAddException} |
| 144 </paper-button> | 143 </paper-button> |
| 145 </div> | 144 </div> |
| 146 </div> | 145 </div> |
| 147 </div> | 146 </div> |
| 148 </template> | 147 </template> |
| 149 <script src="network_proxy.js"></script> | 148 <script src="network_proxy.js"></script> |
| 150 </dom-module> | 149 </dom-module> |
| OLD | NEW |