| 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 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 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 struct ProfileParams { | 297 struct ProfileParams { |
| 298 ProfileParams(); | 298 ProfileParams(); |
| 299 ~ProfileParams(); | 299 ~ProfileParams(); |
| 300 | 300 |
| 301 base::FilePath path; | 301 base::FilePath path; |
| 302 IOThread* io_thread; | 302 IOThread* io_thread; |
| 303 scoped_refptr<CookieSettings> cookie_settings; | 303 scoped_refptr<CookieSettings> cookie_settings; |
| 304 scoped_refptr<HostContentSettingsMap> host_content_settings_map; | 304 scoped_refptr<HostContentSettingsMap> host_content_settings_map; |
| 305 scoped_refptr<net::SSLConfigService> ssl_config_service; | 305 scoped_refptr<net::SSLConfigService> ssl_config_service; |
| 306 scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate; | 306 scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate; |
| 307 #if defined(ENABLE_EXTENSIONS) |
| 307 scoped_refptr<extensions::InfoMap> extension_info_map; | 308 scoped_refptr<extensions::InfoMap> extension_info_map; |
| 309 #endif |
| 308 | 310 |
| 309 // This pointer exists only as a means of conveying a url job factory | 311 // This pointer exists only as a means of conveying a url job factory |
| 310 // pointer from the protocol handler registry on the UI thread to the | 312 // pointer from the protocol handler registry on the UI thread to the |
| 311 // the URLRequestContext on the IO thread. The consumer MUST take | 313 // the URLRequestContext on the IO thread. The consumer MUST take |
| 312 // ownership of the object by calling release() on this pointer. | 314 // ownership of the object by calling release() on this pointer. |
| 313 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> | 315 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> |
| 314 protocol_handler_interceptor; | 316 protocol_handler_interceptor; |
| 315 | 317 |
| 316 // We need to initialize the ProxyConfigService from the UI thread | 318 // We need to initialize the ProxyConfigService from the UI thread |
| 317 // because on linux it relies on initializing things through gconf, | 319 // because on linux it relies on initializing things through gconf, |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 BooleanPrefMember enable_metrics_; | 568 BooleanPrefMember enable_metrics_; |
| 567 #endif | 569 #endif |
| 568 | 570 |
| 569 #if defined(ENABLE_CONFIGURATION_POLICY) | 571 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 570 // Pointed to by NetworkDelegate. | 572 // Pointed to by NetworkDelegate. |
| 571 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_; | 573 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_; |
| 572 mutable scoped_ptr<policy::PolicyHeaderIOHelper> policy_header_helper_; | 574 mutable scoped_ptr<policy::PolicyHeaderIOHelper> policy_header_helper_; |
| 573 #endif | 575 #endif |
| 574 | 576 |
| 575 // Pointed to by URLRequestContext. | 577 // Pointed to by URLRequestContext. |
| 578 #if defined(ENABLE_EXTENSIONS) |
| 576 mutable scoped_refptr<extensions::InfoMap> extension_info_map_; | 579 mutable scoped_refptr<extensions::InfoMap> extension_info_map_; |
| 580 #endif |
| 577 mutable scoped_ptr<net::ChannelIDService> channel_id_service_; | 581 mutable scoped_ptr<net::ChannelIDService> channel_id_service_; |
| 578 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; | 582 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; |
| 579 mutable scoped_ptr<net::FraudulentCertificateReporter> | 583 mutable scoped_ptr<net::FraudulentCertificateReporter> |
| 580 fraudulent_certificate_reporter_; | 584 fraudulent_certificate_reporter_; |
| 581 mutable scoped_ptr<net::ProxyService> proxy_service_; | 585 mutable scoped_ptr<net::ProxyService> proxy_service_; |
| 582 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; | 586 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; |
| 583 mutable scoped_ptr<net::HttpServerProperties> | 587 mutable scoped_ptr<net::HttpServerProperties> |
| 584 http_server_properties_; | 588 http_server_properties_; |
| 585 #if defined(OS_CHROMEOS) | 589 #if defined(OS_CHROMEOS) |
| 586 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_; | 590 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 616 | 620 |
| 617 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 621 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
| 618 bool initialized_on_UI_thread_; | 622 bool initialized_on_UI_thread_; |
| 619 | 623 |
| 620 const Profile::ProfileType profile_type_; | 624 const Profile::ProfileType profile_type_; |
| 621 | 625 |
| 622 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 626 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
| 623 }; | 627 }; |
| 624 | 628 |
| 625 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 629 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
| OLD | NEW |