OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 friend class PacRequest; | 174 friend class PacRequest; |
175 | 175 |
176 // TODO(eroman): change this to a std::set. Note that this requires updating | 176 // TODO(eroman): change this to a std::set. Note that this requires updating |
177 // some tests in proxy_service_unittest.cc such as: | 177 // some tests in proxy_service_unittest.cc such as: |
178 // ProxyServiceTest.InitialPACScriptDownload | 178 // ProxyServiceTest.InitialPACScriptDownload |
179 // which expects requests to finish in the order they were added. | 179 // which expects requests to finish in the order they were added. |
180 typedef std::vector<scoped_refptr<PacRequest> > PendingRequests; | 180 typedef std::vector<scoped_refptr<PacRequest> > PendingRequests; |
181 | 181 |
182 ~ProxyService(); | 182 ~ProxyService(); |
183 | 183 |
184 // Creates a proxy resolver appropriate for this platform that doesn't rely | |
185 // on V8. | |
186 static ProxyResolver* CreateNonV8ProxyResolver(); | |
187 | |
188 // Identifies the proxy configuration. | 184 // Identifies the proxy configuration. |
189 ProxyConfig::ID config_id() const { return config_.id(); } | 185 ProxyConfig::ID config_id() const { return config_.id(); } |
190 | 186 |
191 // Checks to see if the proxy configuration changed, and then updates config_ | 187 // Checks to see if the proxy configuration changed, and then updates config_ |
192 // to reference the new configuration. | 188 // to reference the new configuration. |
193 void UpdateConfig(const BoundNetLog& net_log); | 189 void UpdateConfig(const BoundNetLog& net_log); |
194 | 190 |
195 // Assign |config| as the current configuration. | 191 // Assign |config| as the current configuration. |
196 void SetConfig(const ProxyConfig& config); | 192 void SetConfig(const ProxyConfig& config); |
197 | 193 |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 | 310 |
315 base::WaitableEvent event_; | 311 base::WaitableEvent event_; |
316 CompletionCallbackImpl<SyncProxyServiceHelper> callback_; | 312 CompletionCallbackImpl<SyncProxyServiceHelper> callback_; |
317 ProxyInfo proxy_info_; | 313 ProxyInfo proxy_info_; |
318 int result_; | 314 int result_; |
319 }; | 315 }; |
320 | 316 |
321 } // namespace net | 317 } // namespace net |
322 | 318 |
323 #endif // NET_PROXY_PROXY_SERVICE_H_ | 319 #endif // NET_PROXY_PROXY_SERVICE_H_ |
OLD | NEW |