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

Unified Diff: chromeos/tpm_token_loader.h

Issue 135193007: Use user specific NSSDatabase in CertLoader. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chromeos/tpm_token_loader.h
diff --git a/chromeos/tpm_token_loader.h b/chromeos/tpm_token_loader.h
index 4d79833e6fdc2630848a4241a47267cce5256bdd..2f68b69e1d9a34966da3990b3e7b41cfc9d1a902 100644
--- a/chromeos/tpm_token_loader.h
+++ b/chromeos/tpm_token_loader.h
@@ -35,12 +35,8 @@ class CHROMEOS_EXPORT TPMTokenLoader : public LoginState::Observer {
virtual ~Observer() {}
// Called when the TPM token initialization is done or the case where TPM
- // should stay disabled is detected (e.g. on guest login). If TPM is
- // disabled, |tpm_user_pin|, |tpm_token_name| and |tpm_token_slot_id| will
- // not be set.
- virtual void OnTPMTokenReady(const std::string& tpm_user_pin,
- const std::string& tpm_token_name,
- int tpm_token_slot_id) = 0;
+ // should stay disabled is detected (e.g. on guest login).
+ virtual void OnTPMTokenReady() = 0;
};
// Sets the global instance. Must be called before any calls to Get().
@@ -74,6 +70,8 @@ class CHROMEOS_EXPORT TPMTokenLoader : public LoginState::Observer {
// Checks if the TPM token in ready to be used.
bool IsTPMTokenReady() const;
+ std::string tpm_user_pin() const { return tpm_user_pin_; }
+
private:
TPMTokenLoader();
virtual ~TPMTokenLoader();

Powered by Google App Engine
This is Rietveld 408576698