diff options
author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 04:12:18 +0000 |
---|---|---|
committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 04:12:18 +0000 |
commit | f7f6100c83efab633fd95ead88dad16d6cde0cd7 (patch) | |
tree | c2b9aa312b54f37fa5c4a7705c6d381f02508946 /sync/engine | |
parent | 8bc8d498b83137e38df86e194fba0a85dcc63d97 (diff) | |
download | chromium_src-f7f6100c83efab633fd95ead88dad16d6cde0cd7.zip chromium_src-f7f6100c83efab633fd95ead88dad16d6cde0cd7.tar.gz chromium_src-f7f6100c83efab633fd95ead88dad16d6cde0cd7.tar.bz2 |
[Sync] Add keystore encryption info to about:sync
This patch adds the following fields under the encryption section of about:sync
- Has Keystore Key: whether the encryption handler has a keystore encryption key
- Migration Time: the time migration was performed, or "Not Migrated" if
migration hasn't been performed yet
- Passphrase Type: the actual passphrase type (provides more detail than
Is Using Explicit Passphrase, but stored at a diff layer)
Added sync/api/time.h, which just includes sync/util/time.h but is accessible
from chrome/
BUG=129665
Review URL: https://chromiumcodereview.appspot.com/10917246
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine')
-rw-r--r-- | sync/engine/all_status.cc | 15 | ||||
-rw-r--r-- | sync/engine/all_status.h | 3 |
2 files changed, 18 insertions, 0 deletions
diff --git a/sync/engine/all_status.cc b/sync/engine/all_status.cc index 3df6c29..656d6e0 100644 --- a/sync/engine/all_status.cc +++ b/sync/engine/all_status.cc @@ -154,6 +154,21 @@ void AllStatus::SetCryptoHasPendingKeys(bool has_pending_keys) { status_.crypto_has_pending_keys = has_pending_keys; } +void AllStatus::SetPassphraseType(PassphraseType type) { + ScopedStatusLock lock(this); + status_.passphrase_type = type; +} + +void AllStatus::SetHasKeystoreKey(bool has_keystore_key) { + ScopedStatusLock lock(this); + status_.has_keystore_key = has_keystore_key; +} + +void AllStatus::SetKeystoreMigrationTime(const base::Time& migration_time) { + ScopedStatusLock lock(this); + status_.keystore_migration_time = migration_time; +} + void AllStatus::SetUniqueId(const std::string& guid) { ScopedStatusLock lock(this); status_.unique_id = guid; diff --git a/sync/engine/all_status.h b/sync/engine/all_status.h index e350f57..9649a35 100644 --- a/sync/engine/all_status.h +++ b/sync/engine/all_status.h @@ -53,6 +53,9 @@ class AllStatus : public SyncEngineEventListener { void SetEncryptedTypes(ModelTypeSet types); void SetCryptographerReady(bool ready); void SetCryptoHasPendingKeys(bool has_pending_keys); + void SetPassphraseType(PassphraseType type); + void SetHasKeystoreKey(bool has_keystore_key); + void SetKeystoreMigrationTime(const base::Time& migration_time); void SetUniqueId(const std::string& guid); |