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

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: fix cookies_list.js 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 27 matching lines...) Expand all
38 class MediaDeviceIDSalt; 38 class MediaDeviceIDSalt;
39 class ProtocolHandlerRegistry; 39 class ProtocolHandlerRegistry;
40 class SigninNamesOnIOThread; 40 class SigninNamesOnIOThread;
41 class SupervisedUserURLFilter; 41 class SupervisedUserURLFilter;
42 42
43 namespace extensions { 43 namespace extensions {
44 class InfoMap; 44 class InfoMap;
45 } 45 }
46 46
47 namespace net { 47 namespace net {
48 class ChannelIDService;
48 class CookieStore; 49 class CookieStore;
49 class FraudulentCertificateReporter; 50 class FraudulentCertificateReporter;
50 class FtpTransactionFactory; 51 class FtpTransactionFactory;
51 class HttpServerProperties; 52 class HttpServerProperties;
52 class HttpTransactionFactory; 53 class HttpTransactionFactory;
53 class ServerBoundCertService;
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 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory, 354 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory,
355 content::URLRequestInterceptorScopedVector request_interceptors, 355 content::URLRequestInterceptorScopedVector request_interceptors,
356 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> 356 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
357 protocol_handler_interceptor, 357 protocol_handler_interceptor,
358 net::NetworkDelegate* network_delegate, 358 net::NetworkDelegate* network_delegate,
359 net::FtpTransactionFactory* ftp_transaction_factory) const; 359 net::FtpTransactionFactory* ftp_transaction_factory) const;
360 360
361 // Called when the profile is destroyed. 361 // Called when the profile is destroyed.
362 void ShutdownOnUIThread(); 362 void ShutdownOnUIThread();
363 363
364 // A ServerBoundCertService object is created by a derived class of 364 // A ChannelIDService object is created by a derived class of
365 // ProfileIOData, and the derived class calls this method to set the 365 // ProfileIOData, and the derived class calls this method to set the
366 // server_bound_cert_service_ member and transfers ownership to the base 366 // channel_id_service_ member and transfers ownership to the base
367 // class. 367 // class.
368 void set_server_bound_cert_service( 368 void set_channel_id_service(
369 net::ServerBoundCertService* server_bound_cert_service) const; 369 net::ChannelIDService* channel_id_service) const;
370 370
371 ChromeNetworkDelegate* network_delegate() const { 371 ChromeNetworkDelegate* network_delegate() const {
372 return network_delegate_.get(); 372 return network_delegate_.get();
373 } 373 }
374 374
375 net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const { 375 net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
376 return fraudulent_certificate_reporter_.get(); 376 return fraudulent_certificate_reporter_.get();
377 } 377 }
378 378
379 net::ProxyService* proxy_service() const { 379 net::ProxyService* proxy_service() const {
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 #endif 567 #endif
568 568
569 #if defined(ENABLE_CONFIGURATION_POLICY) 569 #if defined(ENABLE_CONFIGURATION_POLICY)
570 // Pointed to by NetworkDelegate. 570 // Pointed to by NetworkDelegate.
571 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_; 571 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_;
572 mutable scoped_ptr<policy::PolicyHeaderIOHelper> policy_header_helper_; 572 mutable scoped_ptr<policy::PolicyHeaderIOHelper> policy_header_helper_;
573 #endif 573 #endif
574 574
575 // Pointed to by URLRequestContext. 575 // Pointed to by URLRequestContext.
576 mutable scoped_refptr<extensions::InfoMap> extension_info_map_; 576 mutable scoped_refptr<extensions::InfoMap> extension_info_map_;
577 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; 577 mutable scoped_ptr<net::ChannelIDService> channel_id_service_;
578 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; 578 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
579 mutable scoped_ptr<net::FraudulentCertificateReporter> 579 mutable scoped_ptr<net::FraudulentCertificateReporter>
580 fraudulent_certificate_reporter_; 580 fraudulent_certificate_reporter_;
581 mutable scoped_ptr<net::ProxyService> proxy_service_; 581 mutable scoped_ptr<net::ProxyService> proxy_service_;
582 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 582 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
583 mutable scoped_ptr<net::HttpServerProperties> 583 mutable scoped_ptr<net::HttpServerProperties>
584 http_server_properties_; 584 http_server_properties_;
585 #if defined(OS_CHROMEOS) 585 #if defined(OS_CHROMEOS)
586 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_; 586 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
587 mutable std::string username_hash_; 587 mutable std::string username_hash_;
(...skipping 28 matching lines...) Expand all
616 616
617 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 617 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
618 bool initialized_on_UI_thread_; 618 bool initialized_on_UI_thread_;
619 619
620 const Profile::ProfileType profile_type_; 620 const Profile::ProfileType profile_type_;
621 621
622 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 622 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
623 }; 623 };
624 624
625 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 625 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698