Chromium Code Reviews| Index: chrome/browser/resources/settings/internet_page/network_proxy.html |
| diff --git a/chrome/browser/resources/settings/internet_page/network_proxy.html b/chrome/browser/resources/settings/internet_page/network_proxy.html |
| index f2c2b8d900c21dd3c5daaeec3c29c3967251a923..3310d8e49307eca0050462af86828932ce484b4e 100644 |
| --- a/chrome/browser/resources/settings/internet_page/network_proxy.html |
| +++ b/chrome/browser/resources/settings/internet_page/network_proxy.html |
| @@ -47,10 +47,6 @@ |
| #exceptionsDiv network-proxy-exclusions { |
| margin: 10px 0; |
| } |
| - |
| - #proxyDiv paper-toggle-button { |
| - padding: 10px 0; |
| - } |
| </style> |
| <!-- Policy indicator. Only one dom-if below will be shown. --> |
| @@ -123,18 +119,20 @@ |
| </div> |
| <!-- Manual --> |
| - <div id="proxyDiv" class="settings-box continuation single-column indent" |
| + <div class="settings-box continuation indent" |
| hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> |
| - <div class="flex layout horizontal"> |
| - <div id="networkProxyToggleLabel" class="flex"> |
| - $i18n{networkProxyUseSame} |
| - </div> |
| - <paper-toggle-button checked="{{useSameProxy_}}" |
| - disabled="[[!isEditable_('Type', networkProperties, editable, |
| - useSharedProxies_)]]" |
| - aria-labelledby="networkProxyToggleLabel"> |
| - </paper-toggle-button> |
| + <div id="networkProxyToggleLabel" class="flex"> |
| + $i18n{networkProxyUseSame} |
| </div> |
| + <paper-toggle-button checked="{{useSameProxy_}}" |
| + disabled="[[!isEditable_('Type', networkProperties, editable, |
| + useSharedProxies_)]]" |
| + aria-labelledby="networkProxyToggleLabel"> |
| + </paper-toggle-button> |
| + </div> |
| + |
| + <div class="settings-box continuation single-column indent" |
| + hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> |
|
Dan Beam
2017/03/04 02:25:55
every time i see a hidden$= instead of a dom-if, a
stevenjb
2017/03/06 18:33:49
If it helps you feel better, all of network-proxy
|
| <div hidden$="[[!useSameProxy_]]" class="layout vertical"> |
| <network-proxy-input |
| on-proxy-change="onProxyInputChange_" |