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 <string> | 8 #include <string> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 namespace chrome_browser_net { | 40 namespace chrome_browser_net { |
41 class LoadTimeStats; | 41 class LoadTimeStats; |
42 class ResourcePrefetchPredictorObserver; | 42 class ResourcePrefetchPredictorObserver; |
43 } | 43 } |
44 | 44 |
45 namespace extensions { | 45 namespace extensions { |
46 class InfoMap; | 46 class InfoMap; |
47 } | 47 } |
48 | 48 |
49 namespace net { | 49 namespace net { |
50 class CertVerifier; | |
51 class CookieStore; | 50 class CookieStore; |
52 class FraudulentCertificateReporter; | 51 class FraudulentCertificateReporter; |
53 class FtpTransactionFactory; | 52 class FtpTransactionFactory; |
54 class HttpServerProperties; | 53 class HttpServerProperties; |
55 class HttpTransactionFactory; | 54 class HttpTransactionFactory; |
56 class ServerBoundCertService; | 55 class ServerBoundCertService; |
57 class ProxyConfigService; | 56 class ProxyConfigService; |
58 class ProxyService; | 57 class ProxyService; |
59 class SSLConfigService; | 58 class SSLConfigService; |
60 class TransportSecurityState; | 59 class TransportSecurityState; |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 | 269 |
271 // We need to initialize the ProxyConfigService from the UI thread | 270 // We need to initialize the ProxyConfigService from the UI thread |
272 // because on linux it relies on initializing things through gconf, | 271 // because on linux it relies on initializing things through gconf, |
273 // and needs to be on the main thread. | 272 // and needs to be on the main thread. |
274 scoped_ptr<net::ProxyConfigService> proxy_config_service; | 273 scoped_ptr<net::ProxyConfigService> proxy_config_service; |
275 | 274 |
276 #if defined(ENABLE_MANAGED_USERS) | 275 #if defined(ENABLE_MANAGED_USERS) |
277 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter; | 276 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter; |
278 #endif | 277 #endif |
279 | 278 |
280 #if defined(OS_CHROMEOS) | |
281 scoped_ptr<policy::PolicyCertVerifier> cert_verifier; | |
282 #endif | |
283 | |
284 // The profile this struct was populated from. It's passed as a void* to | 279 // The profile this struct was populated from. It's passed as a void* to |
285 // ensure it's not accidently used on the IO thread. Before using it on the | 280 // ensure it's not accidently used on the IO thread. Before using it on the |
286 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. | 281 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. |
287 void* profile; | 282 void* profile; |
288 }; | 283 }; |
289 | 284 |
290 explicit ProfileIOData(bool is_incognito); | 285 explicit ProfileIOData(bool is_incognito); |
291 | 286 |
292 static std::string GetSSLSessionCacheShard(); | 287 static std::string GetSSLSessionCacheShard(); |
293 | 288 |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
494 mutable scoped_refptr<extensions::InfoMap> extension_info_map_; | 489 mutable scoped_refptr<extensions::InfoMap> extension_info_map_; |
495 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; | 490 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; |
496 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; | 491 mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_; |
497 mutable scoped_ptr<net::FraudulentCertificateReporter> | 492 mutable scoped_ptr<net::FraudulentCertificateReporter> |
498 fraudulent_certificate_reporter_; | 493 fraudulent_certificate_reporter_; |
499 mutable scoped_ptr<net::ProxyService> proxy_service_; | 494 mutable scoped_ptr<net::ProxyService> proxy_service_; |
500 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; | 495 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; |
501 mutable scoped_ptr<net::HttpServerProperties> | 496 mutable scoped_ptr<net::HttpServerProperties> |
502 http_server_properties_; | 497 http_server_properties_; |
503 #if defined(OS_CHROMEOS) | 498 #if defined(OS_CHROMEOS) |
504 mutable scoped_ptr<net::CertVerifier> cert_verifier_; | 499 mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_; |
505 #endif | 500 #endif |
506 | 501 |
507 #if defined(ENABLE_NOTIFICATIONS) | 502 #if defined(ENABLE_NOTIFICATIONS) |
508 mutable DesktopNotificationService* notification_service_; | 503 mutable DesktopNotificationService* notification_service_; |
509 #endif | 504 #endif |
510 | 505 |
511 mutable scoped_ptr<TransportSecurityPersister> | 506 mutable scoped_ptr<TransportSecurityPersister> |
512 transport_security_persister_; | 507 transport_security_persister_; |
513 | 508 |
514 // These are only valid in between LazyInitialize() and their accessor being | 509 // These are only valid in between LazyInitialize() and their accessor being |
(...skipping 24 matching lines...) Expand all Loading... |
539 | 534 |
540 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 535 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
541 bool initialized_on_UI_thread_; | 536 bool initialized_on_UI_thread_; |
542 | 537 |
543 bool is_incognito_; | 538 bool is_incognito_; |
544 | 539 |
545 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 540 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
546 }; | 541 }; |
547 | 542 |
548 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 543 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
OLD | NEW |