diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-18 22:02:21 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-18 22:02:21 +0000 |
| commit | 6dfc67bdd9eb27a8dcf6fe74806d4d26f8534cd2 (patch) | |
| tree | 661f4db41d77c732fb3a4d7798d6c9f2c399269b /net/http | |
| parent | b9fbf52c1f0dec4e66aed950cb40d05836fcead5 (diff) | |
| download | chromium_src-6dfc67bdd9eb27a8dcf6fe74806d4d26f8534cd2.zip chromium_src-6dfc67bdd9eb27a8dcf6fe74806d4d26f8534cd2.tar.gz chromium_src-6dfc67bdd9eb27a8dcf6fe74806d4d26f8534cd2.tar.bz2 | |
Merge some changes from branches/mac_july_2008 to trunk.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_layer.cc | 16 | ||||
| -rw-r--r-- | net/http/http_network_layer.h | 4 |
2 files changed, 19 insertions, 1 deletions
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc index 9e13f11..cbb75ce 100644 --- a/net/http/http_network_layer.cc +++ b/net/http/http_network_layer.cc @@ -29,33 +29,42 @@ #include "net/http/http_network_layer.h" +#include "base/notimplemented.h" #include "net/base/client_socket_factory.h" #include "net/http/http_network_session.h" #include "net/http/http_network_transaction.h" -#include "net/http/http_transaction_winhttp.h" #include "net/proxy/proxy_resolver_fixed.h" +#if defined(OS_WIN) +#include "net/http/http_transaction_winhttp.h" #include "net/proxy/proxy_resolver_winhttp.h" +#endif namespace net { //----------------------------------------------------------------------------- +#if defined(OS_WIN) // static bool HttpNetworkLayer::use_winhttp_ = true; +#endif // static HttpTransactionFactory* HttpNetworkLayer::CreateFactory( const ProxyInfo* pi) { +#if defined(OS_WIN) if (use_winhttp_) return new HttpTransactionWinHttp::Factory(pi); +#endif return new HttpNetworkLayer(pi); } +#if defined(OS_WIN) // static void HttpNetworkLayer::UseWinHttp(bool value) { use_winhttp_ = value; } +#endif //----------------------------------------------------------------------------- @@ -65,7 +74,12 @@ HttpNetworkLayer::HttpNetworkLayer(const ProxyInfo* pi) if (pi) { proxy_resolver = new ProxyResolverFixed(*pi); } else { +#if defined(OS_WIN) proxy_resolver = new ProxyResolverWinHttp(); +#else + NOTIMPLEMENTED(); + proxy_resolver = NULL; +#endif } session_ = new HttpNetworkSession(proxy_resolver); } diff --git a/net/http/http_network_layer.h b/net/http/http_network_layer.h index 2b89f79..259c89c 100644 --- a/net/http/http_network_layer.h +++ b/net/http/http_network_layer.h @@ -47,8 +47,10 @@ class HttpNetworkLayer : public HttpTransactionFactory { // and allows other implementations to be substituted. static HttpTransactionFactory* CreateFactory(const ProxyInfo* pi); +#if defined(OS_WIN) // If value is true, then WinHTTP will be used. static void UseWinHttp(bool value); +#endif // HttpTransactionFactory methods: virtual HttpTransaction* CreateTransaction(); @@ -57,7 +59,9 @@ class HttpNetworkLayer : public HttpTransactionFactory { virtual void Suspend(bool suspend); private: +#if defined(OS_WIN) static bool use_winhttp_; +#endif scoped_refptr<HttpNetworkSession> session_; bool suspended_; |