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

Unified 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: Flattened components/cert_database folders. Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 9695bab88b6017152743a947482f05e226837755..5c9466f70a091b3f40bb71557835573118f3c903 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -45,6 +45,10 @@ class ProtocolHandlerRegistry;
class SigninNamesOnIOThread;
class SupervisedUserURLFilter;
+namespace cert_database {
+class CertDatabaseServiceIOPart;
+}
+
namespace chrome_browser_net {
class ResourcePrefetchPredictorObserver;
}
@@ -209,14 +213,6 @@ class ProfileIOData {
return transport_security_state_.get();
}
-#if defined(OS_CHROMEOS)
- std::string username_hash() const {
- return username_hash_;
- }
-
- bool use_system_key_slot() const { return use_system_key_slot_; }
-#endif
-
Profile::ProfileType profile_type() const {
return profile_type_;
}
@@ -333,7 +329,6 @@ class ProfileIOData {
#if defined(OS_CHROMEOS)
std::string username_hash;
- bool use_system_key_slot;
#endif
// The profile this struct was populated from. It's passed as a void* to
@@ -666,8 +661,10 @@ class ProfileIOData {
// case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL.
mutable policy::PolicyCertVerifier* policy_cert_verifier_;
mutable scoped_ptr<net::CertVerifier> cert_verifier_;
- mutable std::string username_hash_;
- mutable bool use_system_key_slot_;
+#endif
+
+#if defined(USE_NSS)
+ mutable base::WeakPtr<cert_database::CertDatabaseServiceIOPart> cert_db_io_;
#endif
mutable scoped_ptr<net::TransportSecurityPersister>
« no previous file with comments | « chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698