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/proxy/proxy_service.h | |
| 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/proxy/proxy_service.h')
| -rw-r--r-- | net/proxy/proxy_service.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index ee2bd23..80a15d1 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -40,7 +40,9 @@ #include "base/time.h" #include "net/base/completion_callback.h" +#if defined(OS_WIN) typedef LPVOID HINTERNET; // From winhttp.h +#endif class GURL; @@ -239,8 +241,10 @@ class ProxyInfo { // This may optionally be a semi-colon delimited list of proxy servers. void UseNamedProxy(const std::string& proxy_server); +#if defined(OS_WIN) // Apply this proxy information to the given WinHTTP request handle. void Apply(HINTERNET request_handle); +#endif // Returns true if this proxy info specifies a direct connection. bool is_direct() const { return proxy_list_.Get().empty(); } |