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

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

Issue 1267383002: Allow preloaded pins to contain report URIs; remove special-case reporting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase fixup Created 5 years, 4 months 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 namespace extensions { 55 namespace extensions {
56 class ExtensionThrottleManager; 56 class ExtensionThrottleManager;
57 class InfoMap; 57 class InfoMap;
58 } 58 }
59 59
60 namespace net { 60 namespace net {
61 class CertificateReportSender; 61 class CertificateReportSender;
62 class CertVerifier; 62 class CertVerifier;
63 class ChannelIDService; 63 class ChannelIDService;
64 class CookieStore; 64 class CookieStore;
65 class FraudulentCertificateReporter;
66 class FtpTransactionFactory; 65 class FtpTransactionFactory;
67 class HttpServerProperties; 66 class HttpServerProperties;
68 class HttpTransactionFactory; 67 class HttpTransactionFactory;
69 class ProxyConfigService; 68 class ProxyConfigService;
70 class ProxyService; 69 class ProxyService;
71 class SSLConfigService; 70 class SSLConfigService;
72 class TransportSecurityPersister; 71 class TransportSecurityPersister;
73 class TransportSecurityState; 72 class TransportSecurityState;
74 class URLRequestJobFactoryImpl; 73 class URLRequestJobFactoryImpl;
75 } // namespace net 74 } // namespace net
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 // ProfileIOData, and the derived class calls this method to set the 349 // ProfileIOData, and the derived class calls this method to set the
351 // channel_id_service_ member and transfers ownership to the base 350 // channel_id_service_ member and transfers ownership to the base
352 // class. 351 // class.
353 void set_channel_id_service( 352 void set_channel_id_service(
354 net::ChannelIDService* channel_id_service) const; 353 net::ChannelIDService* channel_id_service) const;
355 354
356 void set_data_reduction_proxy_io_data( 355 void set_data_reduction_proxy_io_data(
357 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> 356 scoped_ptr<data_reduction_proxy::DataReductionProxyIOData>
358 data_reduction_proxy_io_data) const; 357 data_reduction_proxy_io_data) const;
359 358
360 net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
361 return fraudulent_certificate_reporter_.get();
362 }
363
364 net::ProxyService* proxy_service() const { 359 net::ProxyService* proxy_service() const {
365 return proxy_service_.get(); 360 return proxy_service_.get();
366 } 361 }
367 362
368 base::WeakPtr<net::HttpServerProperties> http_server_properties() const; 363 base::WeakPtr<net::HttpServerProperties> http_server_properties() const;
369 364
370 void set_http_server_properties( 365 void set_http_server_properties(
371 scoped_ptr<net::HttpServerProperties> http_server_properties) const; 366 scoped_ptr<net::HttpServerProperties> http_server_properties) const;
372 367
373 net::URLRequestContext* main_request_context() const { 368 net::URLRequestContext* main_request_context() const {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 532
538 // Pointed to by URLRequestContext. 533 // Pointed to by URLRequestContext.
539 #if defined(ENABLE_EXTENSIONS) 534 #if defined(ENABLE_EXTENSIONS)
540 mutable scoped_refptr<extensions::InfoMap> extension_info_map_; 535 mutable scoped_refptr<extensions::InfoMap> extension_info_map_;
541 #endif 536 #endif
542 mutable scoped_ptr<net::ChannelIDService> channel_id_service_; 537 mutable scoped_ptr<net::ChannelIDService> channel_id_service_;
543 538
544 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> 539 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyIOData>
545 data_reduction_proxy_io_data_; 540 data_reduction_proxy_io_data_;
546 541
547 mutable scoped_ptr<net::FraudulentCertificateReporter>
548 fraudulent_certificate_reporter_;
549 mutable scoped_ptr<net::ProxyService> proxy_service_; 542 mutable scoped_ptr<net::ProxyService> proxy_service_;
550 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 543 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
551 mutable scoped_ptr<net::HttpServerProperties> 544 mutable scoped_ptr<net::HttpServerProperties>
552 http_server_properties_; 545 http_server_properties_;
553 #if defined(OS_CHROMEOS) 546 #if defined(OS_CHROMEOS)
554 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that 547 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
555 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. 548 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL.
556 mutable scoped_ptr<net::CertVerifier> cert_verifier_; 549 mutable scoped_ptr<net::CertVerifier> cert_verifier_;
557 mutable policy::PolicyCertVerifier* policy_cert_verifier_; 550 mutable policy::PolicyCertVerifier* policy_cert_verifier_;
558 mutable std::string username_hash_; 551 mutable std::string username_hash_;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 591
599 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 592 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
600 bool initialized_on_UI_thread_; 593 bool initialized_on_UI_thread_;
601 594
602 const Profile::ProfileType profile_type_; 595 const Profile::ProfileType profile_type_;
603 596
604 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 597 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
605 }; 598 };
606 599
607 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 600 #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