| OLD | NEW |
| 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_SERVICE_H_ | 5 #ifndef NET_PROXY_PROXY_SERVICE_H_ |
| 6 #define NET_PROXY_PROXY_SERVICE_H_ | 6 #define NET_PROXY_PROXY_SERVICE_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 PacRequest** pac_request); | 79 PacRequest** pac_request); |
| 80 | 80 |
| 81 // Call this method with a non-null |pac_request| to cancel the PAC request. | 81 // Call this method with a non-null |pac_request| to cancel the PAC request. |
| 82 void CancelPacRequest(PacRequest* pac_request); | 82 void CancelPacRequest(PacRequest* pac_request); |
| 83 | 83 |
| 84 // Sets the ProxyScriptFetcher dependency. This is needed if the ProxyResolver | 84 // Sets the ProxyScriptFetcher dependency. This is needed if the ProxyResolver |
| 85 // is of type ProxyResolverWithoutFetch. ProxyService takes ownership of | 85 // is of type ProxyResolverWithoutFetch. ProxyService takes ownership of |
| 86 // |proxy_script_fetcher|. | 86 // |proxy_script_fetcher|. |
| 87 void SetProxyScriptFetcher(ProxyScriptFetcher* proxy_script_fetcher); | 87 void SetProxyScriptFetcher(ProxyScriptFetcher* proxy_script_fetcher); |
| 88 | 88 |
| 89 // Tells this ProxyService to start using a new ProxyConfigService to |
| 90 // retrieve its ProxyConfig from. The new ProxyConfigService will immediately |
| 91 // be queried for new config info which will be used for all subsequent |
| 92 // ResolveProxy calls. ProxyService takes ownership of |
| 93 // |new_proxy_config_service|. |
| 94 void ResetConfigService(ProxyConfigService* new_proxy_config_service); |
| 95 |
| 89 // Creates a proxy service using the specified settings. If |pc| is NULL then | 96 // Creates a proxy service using the specified settings. If |pc| is NULL then |
| 90 // the system's default proxy settings will be used (on Windows this will | 97 // the system's default proxy settings will be used (on Windows this will |
| 91 // use IE's settings). | 98 // use IE's settings). |
| 92 static ProxyService* Create(const ProxyConfig* pc); | 99 static ProxyService* Create(const ProxyConfig* pc); |
| 93 | 100 |
| 94 // Creates a proxy service using the specified settings. If |pc| is NULL then | 101 // Creates a proxy service using the specified settings. If |pc| is NULL then |
| 95 // the system's default proxy settings will be used. This is basically the | 102 // the system's default proxy settings will be used. This is basically the |
| 96 // same as Create(const ProxyConfig*), however under the hood it uses a | 103 // same as Create(const ProxyConfig*), however under the hood it uses a |
| 97 // different implementation (V8). |url_request_context| is the URL request | 104 // different implementation (V8). |url_request_context| is the URL request |
| 98 // context that will be used if a PAC script needs to be fetched. | 105 // context that will be used if a PAC script needs to be fetched. |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 | 255 |
| 249 base::WaitableEvent event_; | 256 base::WaitableEvent event_; |
| 250 CompletionCallbackImpl<SyncProxyServiceHelper> callback_; | 257 CompletionCallbackImpl<SyncProxyServiceHelper> callback_; |
| 251 ProxyInfo proxy_info_; | 258 ProxyInfo proxy_info_; |
| 252 int result_; | 259 int result_; |
| 253 }; | 260 }; |
| 254 | 261 |
| 255 } // namespace net | 262 } // namespace net |
| 256 | 263 |
| 257 #endif // NET_PROXY_PROXY_SERVICE_H_ | 264 #endif // NET_PROXY_PROXY_SERVICE_H_ |
| OLD | NEW |