diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 00:12:13 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 00:12:13 +0000 |
commit | be1a48bcd64ea75939f38a9ab264ee99214313bb (patch) | |
tree | c9aa66838177a6e10757ae4547e731a490420bfa /net/proxy/proxy_config.cc | |
parent | f1e99b1b03848eb939fd3f51b56de1b23dfab057 (diff) | |
download | chromium_src-be1a48bcd64ea75939f38a9ab264ee99214313bb.zip chromium_src-be1a48bcd64ea75939f38a9ab264ee99214313bb.tar.gz chromium_src-be1a48bcd64ea75939f38a9ab264ee99214313bb.tar.bz2 |
Even more reordering the methods in headers and implementation in net/.
BUG=68682
TEST=compiles
Review URL: http://codereview.chromium.org/6314010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config.cc')
-rw-r--r-- | net/proxy/proxy_config.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/proxy/proxy_config.cc b/net/proxy/proxy_config.cc index ce14358..70e6549 100644 --- a/net/proxy/proxy_config.cc +++ b/net/proxy/proxy_config.cc @@ -32,17 +32,6 @@ ProxyConfig::ProxyRules::ProxyRules() ProxyConfig::ProxyRules::~ProxyRules() { } -bool ProxyConfig::ProxyRules::Equals(const ProxyRules& other) const { - return type == other.type && - single_proxy == other.single_proxy && - proxy_for_http == other.proxy_for_http && - proxy_for_https == other.proxy_for_https && - proxy_for_ftp == other.proxy_for_ftp && - fallback_proxy == other.fallback_proxy && - bypass_rules.Equals(other.bypass_rules) && - reverse_bypass == other.reverse_bypass; -} - void ProxyConfig::ProxyRules::Apply(const GURL& url, ProxyInfo* result) { if (empty()) { result->UseDirect(); @@ -146,6 +135,17 @@ const ProxyServer* ProxyConfig::ProxyRules::MapUrlSchemeToProxy( return NULL; // No mapping for this scheme. Use direct. } +bool ProxyConfig::ProxyRules::Equals(const ProxyRules& other) const { + return type == other.type && + single_proxy == other.single_proxy && + proxy_for_http == other.proxy_for_http && + proxy_for_https == other.proxy_for_https && + proxy_for_ftp == other.proxy_for_ftp && + fallback_proxy == other.fallback_proxy && + bypass_rules.Equals(other.bypass_rules) && + reverse_bypass == other.reverse_bypass; +} + ProxyServer* ProxyConfig::ProxyRules::MapUrlSchemeToProxyNoFallback( const std::string& scheme) { DCHECK_EQ(TYPE_PROXY_PER_SCHEME, type); |