OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_SERVICE_H_ | 5 #ifndef NET_PROXY_PROXY_SERVICE_H_ |
6 #define NET_PROXY_PROXY_SERVICE_H_ | 6 #define NET_PROXY_PROXY_SERVICE_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 // 1. WPAD auto-detection | 72 // 1. WPAD auto-detection |
73 // 2. PAC URL | 73 // 2. PAC URL |
74 // 3. named proxy | 74 // 3. named proxy |
75 // | 75 // |
76 // Profiling information for the request is saved to |net_log| if non-NULL. | 76 // Profiling information for the request is saved to |net_log| if non-NULL. |
77 int ResolveProxy(const GURL& url, | 77 int ResolveProxy(const GURL& url, |
78 ProxyInfo* results, | 78 ProxyInfo* results, |
79 OldCompletionCallback* callback, | 79 OldCompletionCallback* callback, |
80 PacRequest** pac_request, | 80 PacRequest** pac_request, |
81 const BoundNetLog& net_log); | 81 const BoundNetLog& net_log); |
| 82 int ResolveProxy(const GURL& url, |
| 83 ProxyInfo* results, |
| 84 const net::CompletionCallback& callback, |
| 85 PacRequest** pac_request, |
| 86 const BoundNetLog& net_log); |
82 | 87 |
83 // This method is called after a failure to connect or resolve a host name. | 88 // This method is called after a failure to connect or resolve a host name. |
84 // It gives the proxy service an opportunity to reconsider the proxy to use. | 89 // It gives the proxy service an opportunity to reconsider the proxy to use. |
85 // The |results| parameter contains the results returned by an earlier call | 90 // The |results| parameter contains the results returned by an earlier call |
86 // to ResolveProxy. The semantics of this call are otherwise similar to | 91 // to ResolveProxy. The semantics of this call are otherwise similar to |
87 // ResolveProxy. | 92 // ResolveProxy. |
88 // | 93 // |
89 // NULL can be passed for |pac_request| if the caller will not need to | 94 // NULL can be passed for |pac_request| if the caller will not need to |
90 // cancel the request. | 95 // cancel the request. |
91 // | 96 // |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
399 | 404 |
400 base::WaitableEvent event_; | 405 base::WaitableEvent event_; |
401 OldCompletionCallbackImpl<SyncProxyServiceHelper> callback_; | 406 OldCompletionCallbackImpl<SyncProxyServiceHelper> callback_; |
402 ProxyInfo proxy_info_; | 407 ProxyInfo proxy_info_; |
403 int result_; | 408 int result_; |
404 }; | 409 }; |
405 | 410 |
406 } // namespace net | 411 } // namespace net |
407 | 412 |
408 #endif // NET_PROXY_PROXY_SERVICE_H_ | 413 #endif // NET_PROXY_PROXY_SERVICE_H_ |
OLD | NEW |