chromeos/tpm_token_loader.h - Issue 317613004: Remove usage of singleton software_slot_ in nss on ChromeOS

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/tpm_token_loader.h

Issue 317613004: Remove usage of singleton software_slot_ in nss on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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:

Index: chromeos/tpm_token_loader.h

diff --git a/chromeos/tpm_token_loader.h b/chromeos/tpm_token_loader.h

index 9ac7a61e61df4adfc9b5636c31771a2c35fcd190..8089344d6108998c2f524a1977df65ca7fbbca40 100644

--- a/chromeos/tpm_token_loader.h

+++ b/chromeos/tpm_token_loader.h

@@ -81,7 +81,7 @@ class CHROMEOS_EXPORT TPMTokenLoader : public LoginState::Observer {

// This is the cyclic chain of callbacks to initialize the TPM token.

void ContinueTokenInitialization();

- void OnPersistentNSSDBOpened();

+ void OnTPMTokenEnabledForNSS();

void OnTpmIsEnabled(DBusMethodCallStatus call_status,

bool tpm_is_enabled);

void OnPkcs11IsTpmTokenReady(DBusMethodCallStatus call_status,

@@ -111,7 +111,7 @@ class CHROMEOS_EXPORT TPMTokenLoader : public LoginState::Observer {

enum TPMTokenState {

TPM_STATE_UNKNOWN,

TPM_INITIALIZATION_STARTED,

- TPM_DB_OPENED,

+ TPM_TOKEN_ENABLED_FOR_NSS,

TPM_DISABLED,

TPM_ENABLED,

TPM_TOKEN_READY,

« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chromeos/tpm_token_loader.cc » ('j') | no next file with comments »