| 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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 void InitializeUsingLastFetchedConfig(); | 349 void InitializeUsingLastFetchedConfig(); |
| 350 | 350 |
| 351 // Start the initialization skipping past the "decision" phase. | 351 // Start the initialization skipping past the "decision" phase. |
| 352 void InitializeUsingDecidedConfig( | 352 void InitializeUsingDecidedConfig( |
| 353 int decider_result, | 353 int decider_result, |
| 354 ProxyResolverScriptData* script_data, | 354 ProxyResolverScriptData* script_data, |
| 355 const ProxyConfig& effective_config); | 355 const ProxyConfig& effective_config); |
| 356 | 356 |
| 357 // NetworkChangeNotifier::IPAddressObserver | 357 // NetworkChangeNotifier::IPAddressObserver |
| 358 // When this is called, we re-fetch PAC scripts and re-run WPAD. | 358 // When this is called, we re-fetch PAC scripts and re-run WPAD. |
| 359 virtual void OnIPAddressChanged() OVERRIDE; | 359 virtual void OnIPAddressChanged() override; |
| 360 | 360 |
| 361 // NetworkChangeNotifier::DNSObserver | 361 // NetworkChangeNotifier::DNSObserver |
| 362 // We respond as above. | 362 // We respond as above. |
| 363 virtual void OnDNSChanged() OVERRIDE; | 363 virtual void OnDNSChanged() override; |
| 364 | 364 |
| 365 // ProxyConfigService::Observer | 365 // ProxyConfigService::Observer |
| 366 virtual void OnProxyConfigChanged( | 366 virtual void OnProxyConfigChanged( |
| 367 const ProxyConfig& config, | 367 const ProxyConfig& config, |
| 368 ProxyConfigService::ConfigAvailability availability) OVERRIDE; | 368 ProxyConfigService::ConfigAvailability availability) override; |
| 369 | 369 |
| 370 scoped_ptr<ProxyConfigService> config_service_; | 370 scoped_ptr<ProxyConfigService> config_service_; |
| 371 scoped_ptr<ProxyResolver> resolver_; | 371 scoped_ptr<ProxyResolver> resolver_; |
| 372 | 372 |
| 373 // We store the proxy configuration that was last fetched from the | 373 // We store the proxy configuration that was last fetched from the |
| 374 // ProxyConfigService, as well as the resulting "effective" configuration. | 374 // ProxyConfigService, as well as the resulting "effective" configuration. |
| 375 // The effective configuration is what we condense the original fetched | 375 // The effective configuration is what we condense the original fetched |
| 376 // settings to after testing the various automatic settings (auto-detect | 376 // settings to after testing the various automatic settings (auto-detect |
| 377 // and custom PAC url). | 377 // and custom PAC url). |
| 378 ProxyConfig fetched_config_; | 378 ProxyConfig fetched_config_; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 | 428 |
| 429 // Whether child ProxyScriptDeciders should use QuickCheck | 429 // Whether child ProxyScriptDeciders should use QuickCheck |
| 430 bool quick_check_enabled_; | 430 bool quick_check_enabled_; |
| 431 | 431 |
| 432 DISALLOW_COPY_AND_ASSIGN(ProxyService); | 432 DISALLOW_COPY_AND_ASSIGN(ProxyService); |
| 433 }; | 433 }; |
| 434 | 434 |
| 435 } // namespace net | 435 } // namespace net |
| 436 | 436 |
| 437 #endif // NET_PROXY_PROXY_SERVICE_H_ | 437 #endif // NET_PROXY_PROXY_SERVICE_H_ |
| OLD | NEW |