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 #include <vector> | 10 #include <vector> |
(...skipping 27 matching lines...) Expand all Loading... |
38 class ChromeNetworkDelegate; | 38 class ChromeNetworkDelegate; |
39 class ChromeURLRequestContextGetter; | 39 class ChromeURLRequestContextGetter; |
40 class CookieSettings; | 40 class CookieSettings; |
41 class DevToolsNetworkController; | 41 class DevToolsNetworkController; |
42 class HostContentSettingsMap; | 42 class HostContentSettingsMap; |
43 class MediaDeviceIDSalt; | 43 class MediaDeviceIDSalt; |
44 class ProtocolHandlerRegistry; | 44 class ProtocolHandlerRegistry; |
45 class SigninNamesOnIOThread; | 45 class SigninNamesOnIOThread; |
46 class SupervisedUserURLFilter; | 46 class SupervisedUserURLFilter; |
47 | 47 |
| 48 namespace cert_database { |
| 49 class CertDatabaseServiceIOPart; |
| 50 } |
| 51 |
48 namespace chrome_browser_net { | 52 namespace chrome_browser_net { |
49 class ResourcePrefetchPredictorObserver; | 53 class ResourcePrefetchPredictorObserver; |
50 } | 54 } |
51 | 55 |
52 namespace extensions { | 56 namespace extensions { |
53 class InfoMap; | 57 class InfoMap; |
54 } | 58 } |
55 | 59 |
56 namespace net { | 60 namespace net { |
57 class CertVerifier; | 61 class CertVerifier; |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const; | 206 content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const; |
203 | 207 |
204 DevToolsNetworkController* network_controller() const { | 208 DevToolsNetworkController* network_controller() const { |
205 return network_controller_.get(); | 209 return network_controller_.get(); |
206 } | 210 } |
207 | 211 |
208 net::TransportSecurityState* transport_security_state() const { | 212 net::TransportSecurityState* transport_security_state() const { |
209 return transport_security_state_.get(); | 213 return transport_security_state_.get(); |
210 } | 214 } |
211 | 215 |
212 #if defined(OS_CHROMEOS) | |
213 std::string username_hash() const { | |
214 return username_hash_; | |
215 } | |
216 | |
217 bool use_system_key_slot() const { return use_system_key_slot_; } | |
218 #endif | |
219 | |
220 Profile::ProfileType profile_type() const { | 216 Profile::ProfileType profile_type() const { |
221 return profile_type_; | 217 return profile_type_; |
222 } | 218 } |
223 | 219 |
224 bool IsOffTheRecord() const; | 220 bool IsOffTheRecord() const; |
225 | 221 |
226 IntegerPrefMember* incognito_availibility() const { | 222 IntegerPrefMember* incognito_availibility() const { |
227 return &incognito_availibility_pref_; | 223 return &incognito_availibility_pref_; |
228 } | 224 } |
229 | 225 |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 // because on linux it relies on initializing things through gconf, | 322 // because on linux it relies on initializing things through gconf, |
327 // and needs to be on the main thread. | 323 // and needs to be on the main thread. |
328 scoped_ptr<net::ProxyConfigService> proxy_config_service; | 324 scoped_ptr<net::ProxyConfigService> proxy_config_service; |
329 | 325 |
330 #if defined(ENABLE_MANAGED_USERS) | 326 #if defined(ENABLE_MANAGED_USERS) |
331 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter; | 327 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter; |
332 #endif | 328 #endif |
333 | 329 |
334 #if defined(OS_CHROMEOS) | 330 #if defined(OS_CHROMEOS) |
335 std::string username_hash; | 331 std::string username_hash; |
336 bool use_system_key_slot; | |
337 #endif | 332 #endif |
338 | 333 |
339 // The profile this struct was populated from. It's passed as a void* to | 334 // The profile this struct was populated from. It's passed as a void* to |
340 // ensure it's not accidently used on the IO thread. Before using it on the | 335 // ensure it's not accidently used on the IO thread. Before using it on the |
341 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. | 336 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. |
342 void* profile; | 337 void* profile; |
343 | 338 |
344 prerender::PrerenderTracker* prerender_tracker; | 339 prerender::PrerenderTracker* prerender_tracker; |
345 }; | 340 }; |
346 | 341 |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 fraudulent_certificate_reporter_; | 654 fraudulent_certificate_reporter_; |
660 mutable scoped_ptr<net::ProxyService> proxy_service_; | 655 mutable scoped_ptr<net::ProxyService> proxy_service_; |
661 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; | 656 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; |
662 mutable scoped_ptr<net::HttpServerProperties> | 657 mutable scoped_ptr<net::HttpServerProperties> |
663 http_server_properties_; | 658 http_server_properties_; |
664 #if defined(OS_CHROMEOS) | 659 #if defined(OS_CHROMEOS) |
665 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that | 660 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that |
666 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. | 661 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. |
667 mutable policy::PolicyCertVerifier* policy_cert_verifier_; | 662 mutable policy::PolicyCertVerifier* policy_cert_verifier_; |
668 mutable scoped_ptr<net::CertVerifier> cert_verifier_; | 663 mutable scoped_ptr<net::CertVerifier> cert_verifier_; |
669 mutable std::string username_hash_; | 664 #endif |
670 mutable bool use_system_key_slot_; | 665 |
| 666 #if defined(USE_NSS) |
| 667 mutable base::WeakPtr<cert_database::CertDatabaseServiceIOPart> cert_db_io_; |
671 #endif | 668 #endif |
672 | 669 |
673 mutable scoped_ptr<net::TransportSecurityPersister> | 670 mutable scoped_ptr<net::TransportSecurityPersister> |
674 transport_security_persister_; | 671 transport_security_persister_; |
675 | 672 |
676 // These are only valid in between LazyInitialize() and their accessor being | 673 // These are only valid in between LazyInitialize() and their accessor being |
677 // called. | 674 // called. |
678 mutable scoped_ptr<net::URLRequestContext> main_request_context_; | 675 mutable scoped_ptr<net::URLRequestContext> main_request_context_; |
679 mutable scoped_ptr<net::URLRequestContext> extensions_request_context_; | 676 mutable scoped_ptr<net::URLRequestContext> extensions_request_context_; |
680 // One URLRequestContext per isolated app for main and media requests. | 677 // One URLRequestContext per isolated app for main and media requests. |
(...skipping 21 matching lines...) Expand all Loading... |
702 | 699 |
703 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 700 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
704 bool initialized_on_UI_thread_; | 701 bool initialized_on_UI_thread_; |
705 | 702 |
706 const Profile::ProfileType profile_type_; | 703 const Profile::ProfileType profile_type_; |
707 | 704 |
708 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 705 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
709 }; | 706 }; |
710 | 707 |
711 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 708 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
OLD | NEW |