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

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

Issue 419013003: Replace c/b/nss_context by a KeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added cert_database namespace. Created 6 years, 2 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 #include <vector> 10 #include <vector>
(...skipping 27 matching lines...) Expand all
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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const; 212 content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const;
209 213
210 DevToolsNetworkController* network_controller() const { 214 DevToolsNetworkController* network_controller() const {
211 return network_controller_.get(); 215 return network_controller_.get();
212 } 216 }
213 217
214 net::TransportSecurityState* transport_security_state() const { 218 net::TransportSecurityState* transport_security_state() const {
215 return transport_security_state_.get(); 219 return transport_security_state_.get();
216 } 220 }
217 221
218 #if defined(OS_CHROMEOS)
219 std::string username_hash() const {
220 return username_hash_;
221 }
222
223 bool use_system_key_slot() const { return use_system_key_slot_; }
224 #endif
225
226 Profile::ProfileType profile_type() const { 222 Profile::ProfileType profile_type() const {
227 return profile_type_; 223 return profile_type_;
228 } 224 }
229 225
230 bool IsOffTheRecord() const; 226 bool IsOffTheRecord() const;
231 227
232 IntegerPrefMember* incognito_availibility() const { 228 IntegerPrefMember* incognito_availibility() const {
233 return &incognito_availibility_pref_; 229 return &incognito_availibility_pref_;
234 } 230 }
235 231
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 // because on linux it relies on initializing things through gconf, 328 // because on linux it relies on initializing things through gconf,
333 // and needs to be on the main thread. 329 // and needs to be on the main thread.
334 scoped_ptr<net::ProxyConfigService> proxy_config_service; 330 scoped_ptr<net::ProxyConfigService> proxy_config_service;
335 331
336 #if defined(ENABLE_MANAGED_USERS) 332 #if defined(ENABLE_MANAGED_USERS)
337 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter; 333 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter;
338 #endif 334 #endif
339 335
340 #if defined(OS_CHROMEOS) 336 #if defined(OS_CHROMEOS)
341 std::string username_hash; 337 std::string username_hash;
342 bool use_system_key_slot;
343 #endif 338 #endif
344 339
345 // The profile this struct was populated from. It's passed as a void* to 340 // The profile this struct was populated from. It's passed as a void* to
346 // ensure it's not accidently used on the IO thread. Before using it on the 341 // ensure it's not accidently used on the IO thread. Before using it on the
347 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. 342 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
348 void* profile; 343 void* profile;
349 344
350 prerender::PrerenderTracker* prerender_tracker; 345 prerender::PrerenderTracker* prerender_tracker;
351 }; 346 };
352 347
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 fraudulent_certificate_reporter_; 661 fraudulent_certificate_reporter_;
667 mutable scoped_ptr<net::ProxyService> proxy_service_; 662 mutable scoped_ptr<net::ProxyService> proxy_service_;
668 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 663 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
669 mutable scoped_ptr<net::HttpServerProperties> 664 mutable scoped_ptr<net::HttpServerProperties>
670 http_server_properties_; 665 http_server_properties_;
671 #if defined(OS_CHROMEOS) 666 #if defined(OS_CHROMEOS)
672 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that 667 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
673 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. 668 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL.
674 mutable policy::PolicyCertVerifier* policy_cert_verifier_; 669 mutable policy::PolicyCertVerifier* policy_cert_verifier_;
675 mutable scoped_ptr<net::CertVerifier> cert_verifier_; 670 mutable scoped_ptr<net::CertVerifier> cert_verifier_;
676 mutable std::string username_hash_; 671 #endif
677 mutable bool use_system_key_slot_; 672
673 #if defined(USE_NSS)
674 mutable base::WeakPtr<cert_database::CertDatabaseServiceIOPart> cert_db_io_;
678 #endif 675 #endif
679 676
680 mutable scoped_ptr<net::TransportSecurityPersister> 677 mutable scoped_ptr<net::TransportSecurityPersister>
681 transport_security_persister_; 678 transport_security_persister_;
682 679
683 // These are only valid in between LazyInitialize() and their accessor being 680 // These are only valid in between LazyInitialize() and their accessor being
684 // called. 681 // called.
685 mutable scoped_ptr<net::URLRequestContext> main_request_context_; 682 mutable scoped_ptr<net::URLRequestContext> main_request_context_;
686 mutable scoped_ptr<net::URLRequestContext> extensions_request_context_; 683 mutable scoped_ptr<net::URLRequestContext> extensions_request_context_;
687 // One URLRequestContext per isolated app for main and media requests. 684 // One URLRequestContext per isolated app for main and media requests.
(...skipping 21 matching lines...) Expand all
709 706
710 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 707 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
711 bool initialized_on_UI_thread_; 708 bool initialized_on_UI_thread_;
712 709
713 const Profile::ProfileType profile_type_; 710 const Profile::ProfileType profile_type_;
714 711
715 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 712 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
716 }; 713 };
717 714
718 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 715 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698