summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profiles/profile_io_data.h
diff options
context:
space:
mode:
authormattm@google.com <mattm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-06 22:24:07 +0000
committermattm@google.com <mattm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-06 22:24:07 +0000
commit557737f70d0c097b2f1a78b4acb552dad725ab61 (patch)
tree03a8a5c14f6503eda33e4d28269e3857281ecf59 /chrome/browser/profiles/profile_io_data.h
parent637fc4cd2748b8679a9b4a4a4c518c02b1afa699 (diff)
downloadchromium_src-557737f70d0c097b2f1a78b4acb552dad725ab61.zip
chromium_src-557737f70d0c097b2f1a78b4acb552dad725ab61.tar.gz
chromium_src-557737f70d0c097b2f1a78b4acb552dad725ab61.tar.bz2
Initialize per-ChromeOS-user NSS slots and provide the functions to access them.
BUG=302124 R=mmenke@chromium.org, rsleevi@chromium.org, xiyuan@chromium.org Review URL: https://codereview.chromium.org/53763003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile_io_data.h')
-rw-r--r--chrome/browser/profiles/profile_io_data.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 136235d..d68adde 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -177,6 +177,12 @@ class ProfileIOData {
return transport_security_state_.get();
}
+#if defined(OS_CHROMEOS)
+ std::string username_hash() const {
+ return username_hash_;
+ }
+#endif
+
bool is_incognito() const {
return is_incognito_;
}
@@ -270,6 +276,10 @@ class ProfileIOData {
scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter;
#endif
+#if defined(OS_CHROMEOS)
+ std::string username_hash;
+#endif
+
// The profile this struct was populated from. It's passed as a void* to
// ensure it's not accidently used on the IO thread. Before using it on the
// UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
@@ -494,6 +504,7 @@ class ProfileIOData {
http_server_properties_;
#if defined(OS_CHROMEOS)
mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
+ mutable std::string username_hash_;
#endif
mutable scoped_ptr<net::TransportSecurityPersister>