| 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 <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 void RemovePendingRequest(PacRequest* req); | 381 void RemovePendingRequest(PacRequest* req); |
| 382 | 382 |
| 383 // Called when proxy resolution has completed (either synchronously or | 383 // Called when proxy resolution has completed (either synchronously or |
| 384 // asynchronously). Handles logging the result, and cleaning out | 384 // asynchronously). Handles logging the result, and cleaning out |
| 385 // bad entries from the results list. | 385 // bad entries from the results list. |
| 386 int DidFinishResolvingProxy(const GURL& url, | 386 int DidFinishResolvingProxy(const GURL& url, |
| 387 const std::string& method, | 387 const std::string& method, |
| 388 ProxyDelegate* proxy_delegate, | 388 ProxyDelegate* proxy_delegate, |
| 389 ProxyInfo* result, | 389 ProxyInfo* result, |
| 390 int result_code, | 390 int result_code, |
| 391 const NetLogWithSource& net_log, | 391 const NetLogWithSource& net_log); |
| 392 base::TimeTicks start_time, | |
| 393 bool script_executed); | |
| 394 | 392 |
| 395 // Start initialization using |fetched_config_|. | 393 // Start initialization using |fetched_config_|. |
| 396 void InitializeUsingLastFetchedConfig(); | 394 void InitializeUsingLastFetchedConfig(); |
| 397 | 395 |
| 398 // Start the initialization skipping past the "decision" phase. | 396 // Start the initialization skipping past the "decision" phase. |
| 399 void InitializeUsingDecidedConfig( | 397 void InitializeUsingDecidedConfig( |
| 400 int decider_result, | 398 int decider_result, |
| 401 ProxyResolverScriptData* script_data, | 399 ProxyResolverScriptData* script_data, |
| 402 const ProxyConfig& effective_config); | 400 const ProxyConfig& effective_config); |
| 403 | 401 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 SanitizeUrlPolicy sanitize_url_policy_; | 479 SanitizeUrlPolicy sanitize_url_policy_; |
| 482 | 480 |
| 483 THREAD_CHECKER(thread_checker_); | 481 THREAD_CHECKER(thread_checker_); |
| 484 | 482 |
| 485 DISALLOW_COPY_AND_ASSIGN(ProxyService); | 483 DISALLOW_COPY_AND_ASSIGN(ProxyService); |
| 486 }; | 484 }; |
| 487 | 485 |
| 488 } // namespace net | 486 } // namespace net |
| 489 | 487 |
| 490 #endif // NET_PROXY_PROXY_SERVICE_H_ | 488 #endif // NET_PROXY_PROXY_SERVICE_H_ |
| OLD | NEW |