From 21a52557fc2373e7c3f525072384bb97f7978012 Mon Sep 17 00:00:00 2001 From: "avi@google.com" Date: Thu, 30 Oct 2008 18:51:16 +0000 Subject: oops; will reland once tree is open git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4223 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_service.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'net/proxy/proxy_service.h') diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 8ea3653..c596aab 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -47,16 +47,12 @@ class ProxyConfig { std::string pac_url; // If non-empty, indicates the proxy server to use (of the form host:port). - // If proxies depend on the scheme, a string of the format - // "scheme1=url[:port];scheme2=url[:port]" may be provided here. std::string proxy_server; - // Indicates a list of hosts that should bypass any proxy configuration. For - // these hosts, a direct connection should always be used. - std::vector proxy_bypass; - - // Indicates whether local names (no dots) bypass proxies. - bool proxy_bypass_local_names; + // If non-empty, indicates a comma-delimited list of hosts that should bypass + // any proxy configuration. For these hosts, a direct connection should + // always be used. + std::string proxy_bypass; // Returns true if the given config is equivalent to this config. bool Equals(const ProxyConfig& other) const; -- cgit v1.1