Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(396)

Side by Side Diff: net/proxy/proxy_resolver_winhttp.h

Issue 160510: Better match IE's proxy settings.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix merge conflict Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/proxy/proxy_resolver_v8_unittest.cc ('k') | net/proxy/proxy_resolver_winhttp.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_PROXY_PROXY_RESOLVER_WINHTTP_H_ 5 #ifndef NET_PROXY_PROXY_RESOLVER_WINHTTP_H_
6 #define NET_PROXY_PROXY_RESOLVER_WINHTTP_H_ 6 #define NET_PROXY_PROXY_RESOLVER_WINHTTP_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "googleurl/src/gurl.h" 10 #include "googleurl/src/gurl.h"
(...skipping 12 matching lines...) Expand all
23 23
24 // ProxyResolver implementation: 24 // ProxyResolver implementation:
25 virtual int GetProxyForURL(const GURL& url, 25 virtual int GetProxyForURL(const GURL& url,
26 ProxyInfo* results, 26 ProxyInfo* results,
27 CompletionCallback* /*callback*/, 27 CompletionCallback* /*callback*/,
28 RequestHandle* /*request*/); 28 RequestHandle* /*request*/);
29 virtual void CancelRequest(RequestHandle request); 29 virtual void CancelRequest(RequestHandle request);
30 30
31 private: 31 private:
32 // ProxyResolver implementation: 32 // ProxyResolver implementation:
33 virtual void SetPacScriptByUrlInternal(const GURL& pac_url); 33 virtual int SetPacScript(const GURL& pac_url,
34 34 const std::string& /*pac_bytes*/,
35 CompletionCallback* /*callback*/);
35 bool OpenWinHttpSession(); 36 bool OpenWinHttpSession();
36 void CloseWinHttpSession(); 37 void CloseWinHttpSession();
37 38
38 // Proxy configuration is cached on the session handle. 39 // Proxy configuration is cached on the session handle.
39 HINTERNET session_handle_; 40 HINTERNET session_handle_;
40 41
41 GURL pac_url_; 42 GURL pac_url_;
42 43
43 DISALLOW_COPY_AND_ASSIGN(ProxyResolverWinHttp); 44 DISALLOW_COPY_AND_ASSIGN(ProxyResolverWinHttp);
44 }; 45 };
45 46
46 } // namespace net 47 } // namespace net
47 48
48 #endif // NET_PROXY_PROXY_RESOLVER_WINHTTP_H_ 49 #endif // NET_PROXY_PROXY_RESOLVER_WINHTTP_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_v8_unittest.cc ('k') | net/proxy/proxy_resolver_winhttp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698