OLD | NEW |
1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> | 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
3 <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
_behavior.html"> |
4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> |
5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
6 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 6 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
7 <link rel="import" href="chrome://resources/html/polymer.html"> | 7 <link rel="import" href="chrome://resources/html/polymer.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11
y-keys.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11
y-keys.html"> |
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
-container.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
-container.html"> |
(...skipping 29 matching lines...) Expand all Loading... |
40 flex: none; | 40 flex: none; |
41 } | 41 } |
42 | 42 |
43 #exceptionsDiv { | 43 #exceptionsDiv { |
44 padding: 10px 0; | 44 padding: 10px 0; |
45 } | 45 } |
46 | 46 |
47 #exceptionsDiv network-proxy-exclusions { | 47 #exceptionsDiv network-proxy-exclusions { |
48 margin: 10px 0; | 48 margin: 10px 0; |
49 } | 49 } |
50 | |
51 #proxyDiv paper-toggle-button { | |
52 padding: 10px 0; | |
53 } | |
54 </style> | 50 </style> |
55 | 51 |
56 <!-- Policy indicator. Only one dom-if below will be shown. --> | 52 <!-- Policy indicator. Only one dom-if below will be shown. --> |
57 <template is="dom-if" | 53 <template is="dom-if" |
58 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> | 54 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> |
59 <div class="settings-box continuation single-column"> | 55 <div class="settings-box continuation single-column"> |
60 <div class="layout horizontal center"> | 56 <div class="layout horizontal center"> |
61 <cr-policy-network-indicator | 57 <cr-policy-network-indicator |
62 property="[[networkProperties.ProxySettings.Type]]" | 58 property="[[networkProperties.ProxySettings.Type]]" |
63 ignore-extensions> | 59 ignore-extensions> |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 </div> | 113 </div> |
118 | 114 |
119 <!-- Web Proxy Auto Discovery (WPAD) --> | 115 <!-- Web Proxy Auto Discovery (WPAD) --> |
120 <div class="settings-box continuation indent" | 116 <div class="settings-box continuation indent" |
121 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]"> | 117 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]"> |
122 <div>$i18n{networkSectionWpad}</div> | 118 <div>$i18n{networkSectionWpad}</div> |
123 <div class="middle flex">[[WPAD_]]</div> | 119 <div class="middle flex">[[WPAD_]]</div> |
124 </div> | 120 </div> |
125 | 121 |
126 <!-- Manual --> | 122 <!-- Manual --> |
127 <div id="proxyDiv" class="settings-box continuation single-column indent" | 123 <div class="settings-box continuation indent" |
128 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> | 124 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> |
129 <div class="flex layout horizontal"> | 125 <div id="networkProxyToggleLabel" class="flex"> |
130 <div id="networkProxyToggleLabel" class="flex"> | 126 $i18n{networkProxyUseSame} |
131 $i18n{networkProxyUseSame} | |
132 </div> | |
133 <paper-toggle-button checked="{{useSameProxy_}}" | |
134 disabled="[[!isEditable_('Type', networkProperties, editable, | |
135 useSharedProxies_)]]" | |
136 aria-labelledby="networkProxyToggleLabel"> | |
137 </paper-toggle-button> | |
138 </div> | 127 </div> |
| 128 <paper-toggle-button checked="{{useSameProxy_}}" |
| 129 disabled="[[!isEditable_('Type', networkProperties, editable, |
| 130 useSharedProxies_)]]" |
| 131 aria-labelledby="networkProxyToggleLabel"> |
| 132 </paper-toggle-button> |
| 133 </div> |
| 134 |
| 135 <div class="settings-box continuation single-column indent" |
| 136 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> |
139 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> | 137 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> |
140 <network-proxy-input | 138 <network-proxy-input |
141 on-proxy-change="onProxyInputChange_" | 139 on-proxy-change="onProxyInputChange_" |
142 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, | 140 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, |
143 editable, useSharedProxies_)]]" | 141 editable, useSharedProxies_)]]" |
144 value="{{proxy_.Manual.HTTPProxy}}" | 142 value="{{proxy_.Manual.HTTPProxy}}" |
145 label="$i18n{networkProxy}"> | 143 label="$i18n{networkProxy}"> |
146 </network-proxy-input> | 144 </network-proxy-input> |
147 </div> | 145 </div> |
148 <div hidden$="[[useSameProxy_]]" class="layout vertical"> | 146 <div hidden$="[[useSameProxy_]]" class="layout vertical"> |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 </paper-button> | 214 </paper-button> |
217 <paper-button class="action-button" | 215 <paper-button class="action-button" |
218 on-tap="onAllowSharedDialogConfirm_"> | 216 on-tap="onAllowSharedDialogConfirm_"> |
219 $i18n{confirm} | 217 $i18n{confirm} |
220 </paper-button> | 218 </paper-button> |
221 </div> | 219 </div> |
222 </dialog> | 220 </dialog> |
223 </template> | 221 </template> |
224 <script src="network_proxy.js"></script> | 222 <script src="network_proxy.js"></script> |
225 </dom-module> | 223 </dom-module> |
OLD | NEW |