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

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

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 5 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 | Annotate | Revision Log
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 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 namespace extensions { 43 namespace extensions {
44 class InfoMap; 44 class InfoMap;
45 } 45 }
46 46
47 namespace net { 47 namespace net {
48 class CookieStore; 48 class CookieStore;
49 class FraudulentCertificateReporter; 49 class FraudulentCertificateReporter;
50 class FtpTransactionFactory; 50 class FtpTransactionFactory;
51 class HttpServerProperties; 51 class HttpServerProperties;
52 class HttpTransactionFactory; 52 class HttpTransactionFactory;
53 class ServerBoundCertService; 53 class ChannelIDService;
wtc 2014/07/01 19:50:51 List in alphabetical order.
Ryan Hamilton 2014/07/21 19:12:08 Done.
54 class ProxyConfigService; 54 class ProxyConfigService;
55 class ProxyService; 55 class ProxyService;
56 class SSLConfigService; 56 class SSLConfigService;
57 class TransportSecurityPersister; 57 class TransportSecurityPersister;
58 class TransportSecurityState; 58 class TransportSecurityState;
59 class URLRequestJobFactoryImpl; 59 class URLRequestJobFactoryImpl;
60 } // namespace net 60 } // namespace net
61 61
62 namespace policy { 62 namespace policy {
63 class PolicyCertVerifier; 63 class PolicyCertVerifier;
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory, 344 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory,
345 content::URLRequestInterceptorScopedVector request_interceptors, 345 content::URLRequestInterceptorScopedVector request_interceptors,
346 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> 346 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
347 protocol_handler_interceptor, 347 protocol_handler_interceptor,
348 net::NetworkDelegate* network_delegate, 348 net::NetworkDelegate* network_delegate,
349 net::FtpTransactionFactory* ftp_transaction_factory) const; 349 net::FtpTransactionFactory* ftp_transaction_factory) const;
350 350
351 // Called when the profile is destroyed. 351 // Called when the profile is destroyed.
352 void ShutdownOnUIThread(); 352 void ShutdownOnUIThread();
353 353
354 // A ServerBoundCertService object is created by a derived class of 354 // A ChannelIDService object is created by a derived class of
355 // ProfileIOData, and the derived class calls this method to set the 355 // ProfileIOData, and the derived class calls this method to set the
356 // server_bound_cert_service_ member and transfers ownership to the base 356 // channel_id_service_ member and transfers ownership to the base
357 // class. 357 // class.
358 void set_server_bound_cert_service( 358 void set_channel_id_service(
359 net::ServerBoundCertService* server_bound_cert_service) const; 359 net::ChannelIDService* channel_id_service) const;
360 360
361 ChromeNetworkDelegate* network_delegate() const { 361 ChromeNetworkDelegate* network_delegate() const {
362 return network_delegate_.get(); 362 return network_delegate_.get();
363 } 363 }
364 364
365 net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const { 365 net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
366 return fraudulent_certificate_reporter_.get(); 366 return fraudulent_certificate_reporter_.get();
367 } 367 }
368 368
369 net::ProxyService* proxy_service() const { 369 net::ProxyService* proxy_service() const {
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 #endif 555 #endif
556 556
557 #if defined(ENABLE_CONFIGURATION_POLICY) 557 #if defined(ENABLE_CONFIGURATION_POLICY)
558 // Pointed to by NetworkDelegate. 558 // Pointed to by NetworkDelegate.
559 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_; 559 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_;
560 mutable scoped_ptr<policy::PolicyHeaderIOHelper> policy_header_helper_; 560 mutable scoped_ptr<policy::PolicyHeaderIOHelper> policy_header_helper_;
561 #endif 561 #endif
562 562
563 // Pointed to by URLRequestContext. 563 // Pointed to by URLRequestContext.
564 mutable scoped_refptr<extensions::InfoMap> extension_info_map_; 564 mutable scoped_refptr<extensions::InfoMap> extension_info_map_;
565 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; 565 mutable scoped_ptr<net::ChannelIDService> channel_id_service_;
566 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; 566 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
567 mutable scoped_ptr<net::FraudulentCertificateReporter> 567 mutable scoped_ptr<net::FraudulentCertificateReporter>
568 fraudulent_certificate_reporter_; 568 fraudulent_certificate_reporter_;
569 mutable scoped_ptr<net::ProxyService> proxy_service_; 569 mutable scoped_ptr<net::ProxyService> proxy_service_;
570 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 570 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
571 mutable scoped_ptr<net::HttpServerProperties> 571 mutable scoped_ptr<net::HttpServerProperties>
572 http_server_properties_; 572 http_server_properties_;
573 #if defined(OS_CHROMEOS) 573 #if defined(OS_CHROMEOS)
574 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_; 574 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
575 mutable std::string username_hash_; 575 mutable std::string username_hash_;
(...skipping 28 matching lines...) Expand all
604 604
605 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 605 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
606 bool initialized_on_UI_thread_; 606 bool initialized_on_UI_thread_;
607 607
608 const Profile::ProfileType profile_type_; 608 const Profile::ProfileType profile_type_;
609 609
610 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 610 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
611 }; 611 };
612 612
613 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 613 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698