summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_server.h
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 16:29:33 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 16:29:33 +0000
commite84925d3e94486d97ba4c477b830ef2249cffff7 (patch)
tree5c74000c30019350fb35fa574d31acc99bc35611 /net/proxy/proxy_server.h
parent0983c7a0180c34abe1b0d305797e538c65fce6cc (diff)
downloadchromium_src-e84925d3e94486d97ba4c477b830ef2249cffff7.zip
chromium_src-e84925d3e94486d97ba4c477b830ef2249cffff7.tar.gz
chromium_src-e84925d3e94486d97ba4c477b830ef2249cffff7.tar.bz2
Migrate Proxy Settings API to net::ProxyServer
BUG=none TEST=none Review URL: http://codereview.chromium.org/6450006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_server.h')
-rw-r--r--net/proxy/proxy_server.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/proxy/proxy_server.h b/net/proxy/proxy_server.h
index 3786ddb..3167252 100644
--- a/net/proxy/proxy_server.h
+++ b/net/proxy/proxy_server.h
@@ -128,6 +128,12 @@ class ProxyServer {
// scheme. Returns -1 if unknown.
static int GetDefaultPortForScheme(Scheme scheme);
+ // Parses the proxy scheme from a URL-like representation, to a
+ // ProxyServer::Scheme. This corresponds with the values used in
+ // ProxyServer::ToURI(). If no type could be matched, returns SCHEME_INVALID.
+ // |scheme| can be one of http, https, socks, socks4, socks5, direct.
+ static Scheme GetSchemeFromURI(const std::string& scheme);
+
bool operator==(const ProxyServer& other) const {
return scheme_ == other.scheme_ &&
host_port_pair_.Equals(other.host_port_pair_);