OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 void RemovePendingRequest(PacRequest* req); | 356 void RemovePendingRequest(PacRequest* req); |
357 | 357 |
358 // Called when proxy resolution has completed (either synchronously or | 358 // Called when proxy resolution has completed (either synchronously or |
359 // asynchronously). Handles logging the result, and cleaning out | 359 // asynchronously). Handles logging the result, and cleaning out |
360 // bad entries from the results list. | 360 // bad entries from the results list. |
361 int DidFinishResolvingProxy(const GURL& url, | 361 int DidFinishResolvingProxy(const GURL& url, |
362 int load_flags, | 362 int load_flags, |
363 NetworkDelegate* network_delegate, | 363 NetworkDelegate* network_delegate, |
364 ProxyInfo* result, | 364 ProxyInfo* result, |
365 int result_code, | 365 int result_code, |
366 const BoundNetLog& net_log); | 366 const BoundNetLog& net_log, |
| 367 base::TimeTicks start_time, |
| 368 bool script_executed); |
367 | 369 |
368 // Start initialization using |fetched_config_|. | 370 // Start initialization using |fetched_config_|. |
369 void InitializeUsingLastFetchedConfig(); | 371 void InitializeUsingLastFetchedConfig(); |
370 | 372 |
371 // Start the initialization skipping past the "decision" phase. | 373 // Start the initialization skipping past the "decision" phase. |
372 void InitializeUsingDecidedConfig( | 374 void InitializeUsingDecidedConfig( |
373 int decider_result, | 375 int decider_result, |
374 ProxyResolverScriptData* script_data, | 376 ProxyResolverScriptData* script_data, |
375 const ProxyConfig& effective_config); | 377 const ProxyConfig& effective_config); |
376 | 378 |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
449 | 451 |
450 // Whether child ProxyScriptDeciders should use QuickCheck | 452 // Whether child ProxyScriptDeciders should use QuickCheck |
451 bool quick_check_enabled_; | 453 bool quick_check_enabled_; |
452 | 454 |
453 DISALLOW_COPY_AND_ASSIGN(ProxyService); | 455 DISALLOW_COPY_AND_ASSIGN(ProxyService); |
454 }; | 456 }; |
455 | 457 |
456 } // namespace net | 458 } // namespace net |
457 | 459 |
458 #endif // NET_PROXY_PROXY_SERVICE_H_ | 460 #endif // NET_PROXY_PROXY_SERVICE_H_ |
OLD | NEW |