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

Side by Side Diff: net/proxy/proxy_resolver_mac.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.h ('k') | net/proxy/proxy_resolver_perftest.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) 2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_MAC_H_ 5 #ifndef NET_PROXY_PROXY_RESOLVER_MAC_H_
6 #define NET_PROXY_PROXY_RESOLVER_MAC_H_ 6 #define NET_PROXY_PROXY_RESOLVER_MAC_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "googleurl/src/gurl.h" 10 #include "googleurl/src/gurl.h"
11 #include "net/base/net_errors.h"
11 #include "net/proxy/proxy_config_service.h" 12 #include "net/proxy/proxy_config_service.h"
12 #include "net/proxy/proxy_resolver.h" 13 #include "net/proxy/proxy_resolver.h"
13 14
14 namespace net { 15 namespace net {
15 16
16 // Implementation of ProxyResolver that uses the Mac CFProxySupport to implement 17 // Implementation of ProxyResolver that uses the Mac CFProxySupport to implement
17 // proxies. 18 // proxies.
18 class ProxyResolverMac : public ProxyResolver { 19 class ProxyResolverMac : public ProxyResolver {
19 public: 20 public:
20 ProxyResolverMac() : ProxyResolver(false /*expects_pac_bytes*/) {} 21 ProxyResolverMac() : ProxyResolver(false /*expects_pac_bytes*/) {}
21 22
22 // ProxyResolver methods: 23 // ProxyResolver methods:
23 virtual int GetProxyForURL(const GURL& url, 24 virtual int GetProxyForURL(const GURL& url,
24 ProxyInfo* results, 25 ProxyInfo* results,
25 CompletionCallback* callback, 26 CompletionCallback* callback,
26 RequestHandle* request); 27 RequestHandle* request);
27 28
28 virtual void CancelRequest(RequestHandle request) { 29 virtual void CancelRequest(RequestHandle request) {
29 NOTREACHED(); 30 NOTREACHED();
30 } 31 }
31 32
32 private: 33 private:
33 virtual void SetPacScriptByUrlInternal(const GURL& pac_url) { 34 virtual int SetPacScript(const GURL& pac_url,
35 const std::string& /*pac_bytes*/,
36 CompletionCallback* /*callback*/) {
34 pac_url_ = pac_url; 37 pac_url_ = pac_url;
38 return OK;
35 } 39 }
36 40
37 GURL pac_url_; 41 GURL pac_url_;
38 }; 42 };
39 43
40 class ProxyConfigServiceMac : public ProxyConfigService { 44 class ProxyConfigServiceMac : public ProxyConfigService {
41 public: 45 public:
42 // ProxyConfigService methods: 46 // ProxyConfigService methods:
43 virtual int GetProxyConfig(ProxyConfig* config); 47 virtual int GetProxyConfig(ProxyConfig* config);
44 }; 48 };
45 49
46 } // namespace net 50 } // namespace net
47 51
48 #endif // NET_PROXY_PROXY_RESOLVER_MAC_H_ 52 #endif // NET_PROXY_PROXY_RESOLVER_MAC_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver.h ('k') | net/proxy/proxy_resolver_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698