Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Side by Side Diff: chrome/browser/profiles/profile_io_data.h

Issue 734263003: Move data reduction proxy logic out of chrome and android webview network delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 return data_reduction_proxy_event_store_.get(); 444 return data_reduction_proxy_event_store_.get();
445 } 445 }
446 446
447 void set_data_reduction_proxy_event_store( 447 void set_data_reduction_proxy_event_store(
448 scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore> 448 scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
449 data_reduction_proxy_event_store) const { 449 data_reduction_proxy_event_store) const {
450 data_reduction_proxy_event_store_ = 450 data_reduction_proxy_event_store_ =
451 data_reduction_proxy_event_store.Pass(); 451 data_reduction_proxy_event_store.Pass();
452 } 452 }
453 453
454 ChromeNetworkDelegate* network_delegate() const {
455 return network_delegate_.get();
456 }
457
458 net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const { 454 net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
459 return fraudulent_certificate_reporter_.get(); 455 return fraudulent_certificate_reporter_.get();
460 } 456 }
461 457
462 net::ProxyService* proxy_service() const { 458 net::ProxyService* proxy_service() const {
463 return proxy_service_.get(); 459 return proxy_service_.get();
464 } 460 }
465 461
466 base::WeakPtr<net::HttpServerProperties> http_server_properties() const; 462 base::WeakPtr<net::HttpServerProperties> http_server_properties() const;
467 463
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 StoragePartitionDescriptorLess> 523 StoragePartitionDescriptorLess>
528 URLRequestContextMap; 524 URLRequestContextMap;
529 525
530 // -------------------------------------------- 526 // --------------------------------------------
531 // Virtual interface for subtypes to implement: 527 // Virtual interface for subtypes to implement:
532 // -------------------------------------------- 528 // --------------------------------------------
533 529
534 // Does the actual initialization of the ProfileIOData subtype. Subtypes 530 // Does the actual initialization of the ProfileIOData subtype. Subtypes
535 // should use the static helper functions above to implement this. 531 // should use the static helper functions above to implement this.
536 virtual void InitializeInternal( 532 virtual void InitializeInternal(
533 scoped_ptr<ChromeNetworkDelegate> chrome_network_delegate,
537 ProfileParams* profile_params, 534 ProfileParams* profile_params,
538 content::ProtocolHandlerMap* protocol_handlers, 535 content::ProtocolHandlerMap* protocol_handlers,
539 content::URLRequestInterceptorScopedVector 536 content::URLRequestInterceptorScopedVector
540 request_interceptors) const = 0; 537 request_interceptors) const = 0;
541 538
542 // Initializes the RequestContext for extensions. 539 // Initializes the RequestContext for extensions.
543 virtual void InitializeExtensionsRequestContext( 540 virtual void InitializeExtensionsRequestContext(
544 ProfileParams* profile_params) const = 0; 541 ProfileParams* profile_params) const = 0;
545 // Does an on-demand initialization of a RequestContext for the given 542 // Does an on-demand initialization of a RequestContext for the given
546 // isolated app. 543 // isolated app.
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 652
656 // data_reduction_proxy_* classes must be declared before |network_delegate_|. 653 // data_reduction_proxy_* classes must be declared before |network_delegate_|.
657 // The data_reduction_proxy_* classes are passed in to |network_delegate_|, 654 // The data_reduction_proxy_* classes are passed in to |network_delegate_|,
658 // so this ordering ensures that the |network_delegate_| never references 655 // so this ordering ensures that the |network_delegate_| never references
659 // freed objects. 656 // freed objects.
660 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyParams> 657 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
661 data_reduction_proxy_params_; 658 data_reduction_proxy_params_;
662 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats> 659 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
663 data_reduction_proxy_usage_stats_; 660 data_reduction_proxy_usage_stats_;
664 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs> 661 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
665 data_reduction_proxy_statistics_prefs_; 662 data_reduction_proxy_statistics_prefs_;
666 mutable base::Callback<void(bool)> data_reduction_proxy_unavailable_callback_; 663 mutable base::Callback<void(bool)> data_reduction_proxy_unavailable_callback_;
667 mutable scoped_ptr<DataReductionProxyChromeConfigurator> 664 mutable scoped_ptr<DataReductionProxyChromeConfigurator>
668 data_reduction_proxy_chrome_configurator_; 665 data_reduction_proxy_chrome_configurator_;
669 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler> 666 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
670 data_reduction_proxy_auth_request_handler_; 667 data_reduction_proxy_auth_request_handler_;
671 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore> 668 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
672 data_reduction_proxy_event_store_; 669 data_reduction_proxy_event_store_;
673 670
674 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
675 mutable scoped_ptr<net::FraudulentCertificateReporter> 671 mutable scoped_ptr<net::FraudulentCertificateReporter>
676 fraudulent_certificate_reporter_; 672 fraudulent_certificate_reporter_;
677 mutable scoped_ptr<net::ProxyService> proxy_service_; 673 mutable scoped_ptr<net::ProxyService> proxy_service_;
678 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 674 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
679 mutable scoped_ptr<net::HttpServerProperties> 675 mutable scoped_ptr<net::HttpServerProperties>
680 http_server_properties_; 676 http_server_properties_;
681 #if defined(OS_CHROMEOS) 677 #if defined(OS_CHROMEOS)
682 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that 678 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
683 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. 679 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL.
684 mutable policy::PolicyCertVerifier* policy_cert_verifier_; 680 mutable policy::PolicyCertVerifier* policy_cert_verifier_;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 715
720 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 716 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
721 bool initialized_on_UI_thread_; 717 bool initialized_on_UI_thread_;
722 718
723 const Profile::ProfileType profile_type_; 719 const Profile::ProfileType profile_type_;
724 720
725 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 721 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
726 }; 722 };
727 723
728 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 724 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698