summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_layer.h
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-18 22:02:21 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-18 22:02:21 +0000
commit6dfc67bdd9eb27a8dcf6fe74806d4d26f8534cd2 (patch)
tree661f4db41d77c732fb3a4d7798d6c9f2c399269b /net/http/http_network_layer.h
parentb9fbf52c1f0dec4e66aed950cb40d05836fcead5 (diff)
downloadchromium_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/http_network_layer.h')
-rw-r--r--net/http/http_network_layer.h4
1 files changed, 4 insertions, 0 deletions
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_;