Commit 8fad8c5b authored by Steven Bennetts's avatar Steven Bennetts Committed by Commit Bot

Network Settings proxy: Fix 'use same' toggle logic

Bug: 876111
Change-Id: I8338c42e716142c4280336ea223205941002c6bf
Reviewed-on: https://chromium-review.googlesource.com/1185724Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589645}
parent 835d71fc
...@@ -191,7 +191,8 @@ Polymer({ ...@@ -191,7 +191,8 @@ Polymer({
(CrOnc.proxyMatches(jsonHttp, proxy.Manual.SecureHTTPProxy) && (CrOnc.proxyMatches(jsonHttp, proxy.Manual.SecureHTTPProxy) &&
CrOnc.proxyMatches(jsonHttp, proxy.Manual.FTPProxy) && CrOnc.proxyMatches(jsonHttp, proxy.Manual.FTPProxy) &&
CrOnc.proxyMatches(jsonHttp, proxy.Manual.SOCKS)) || CrOnc.proxyMatches(jsonHttp, proxy.Manual.SOCKS)) ||
(!proxy.Manual.SecureHTTPProxy.Host && (!proxy.Manual.HTTPProxy.Host &&
!proxy.Manual.SecureHTTPProxy.Host &&
!proxy.Manual.FTPProxy.Host && !proxy.Manual.SOCKS.Host); !proxy.Manual.FTPProxy.Host && !proxy.Manual.SOCKS.Host);
} }
if (proxySettings.ExcludeDomains) { if (proxySettings.ExcludeDomains) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment