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

Unified Diff: sync/internal_api/public/sync_encryption_handler.h

Issue 10916036: [Sync] Implement keystore migration support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 3 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: sync/internal_api/public/sync_encryption_handler.h
diff --git a/sync/internal_api/public/sync_encryption_handler.h b/sync/internal_api/public/sync_encryption_handler.h
index 88ec7a27e3bf91468533b7897aa2896139bfbc41..1ed3bcdc31a6bac55b56b1392f2d090297d1cba4 100644
--- a/sync/internal_api/public/sync_encryption_handler.h
+++ b/sync/internal_api/public/sync_encryption_handler.h
@@ -31,7 +31,7 @@ enum PassphraseRequiredReason {
// The different states for the encryption passphrase. These control if and how
// the user should be prompted for a decryption passphrase.
-enum PassphraseState {
+enum PassphraseType {
IMPLICIT_PASSPHRASE = 0, // GAIA-based passphrase (deprecated).
KEYSTORE_PASSPHRASE = 1, // Keystore passphrase.
FROZEN_IMPLICIT_PASSPHRASE = 2, // Frozen GAIA passphrase.
@@ -112,7 +112,7 @@ class SyncEncryptionHandler {
virtual void OnCryptographerStateChanged(Cryptographer* cryptographer) = 0;
// The passprhase state has changed.
- virtual void OnPassphraseStateChanged(PassphraseState state) = 0;
+ virtual void OnPassphraseTypeChanged(PassphraseType type) = 0;
protected:
virtual ~Observer();
@@ -160,7 +160,7 @@ class SyncEncryptionHandler {
// Returns the current state of the passphrase needed to decrypt the
// bag of encryption keys in the nigori node.
- virtual PassphraseState GetPassphraseState() const = 0;
+ virtual PassphraseType GetPassphraseType() const = 0;
// The set of types that are always encrypted.
static ModelTypeSet SensitiveTypes();

Powered by Google App Engine
This is Rietveld 408576698