diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 17:15:56 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 17:15:56 +0000 |
| commit | 153d44b69e23ac6e1ca2efa64ef5544f08cb8c71 (patch) | |
| tree | d998fd23a0dc7de5148c2b53b2a2769d4e4bddbc /net/http | |
| parent | 55209a4b0b801a3bc2f790d4a75d10ccfdf34f6e (diff) | |
| download | chromium_src-153d44b69e23ac6e1ca2efa64ef5544f08cb8c71.zip chromium_src-153d44b69e23ac6e1ca2efa64ef5544f08cb8c71.tar.gz chromium_src-153d44b69e23ac6e1ca2efa64ef5544f08cb8c71.tar.bz2 | |
Relanding of r4221, initial proxy support for the Mac
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_layer.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc index 1aaa226..9822998 100644 --- a/net/http/http_network_layer.cc +++ b/net/http/http_network_layer.cc @@ -13,6 +13,8 @@ #if defined(OS_WIN) #include "net/http/http_transaction_winhttp.h" #include "net/proxy/proxy_resolver_winhttp.h" +#elif defined(OS_MACOSX) +#include "net/proxy/proxy_resolver_mac.h" #endif namespace net { @@ -51,6 +53,8 @@ HttpNetworkLayer::HttpNetworkLayer(const ProxyInfo* pi) } else { #if defined(OS_WIN) proxy_resolver_.reset(new ProxyResolverWinHttp()); +#elif defined(OS_MACOSX) + proxy_resolver_.reset(new ProxyResolverMac()); #else NOTIMPLEMENTED(); proxy_resolver_.reset(new ProxyResolverNull()); |