From f7f6100c83efab633fd95ead88dad16d6cde0cd7 Mon Sep 17 00:00:00 2001 From: "zea@chromium.org" Date: Wed, 19 Sep 2012 04:12:18 +0000 Subject: [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 --- sync/internal_api/public/engine/sync_status.cc | 4 +++- sync/internal_api/public/engine/sync_status.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'sync/internal_api/public/engine') diff --git a/sync/internal_api/public/engine/sync_status.cc b/sync/internal_api/public/engine/sync_status.cc index 9ed3bf3..4018a74 100644 --- a/sync/internal_api/public/engine/sync_status.cc +++ b/sync/internal_api/public/engine/sync_status.cc @@ -30,7 +30,9 @@ SyncStatus::SyncStatus() useless_sync_cycles(0), useful_sync_cycles(0), cryptographer_ready(false), - crypto_has_pending_keys(false) { + crypto_has_pending_keys(false), + has_keystore_key(false), + passphrase_type(IMPLICIT_PASSPHRASE) { } SyncStatus::~SyncStatus() { diff --git a/sync/internal_api/public/engine/sync_status.h b/sync/internal_api/public/engine/sync_status.h index dfd9603..3b9229f 100644 --- a/sync/internal_api/public/engine/sync_status.h +++ b/sync/internal_api/public/engine/sync_status.h @@ -9,6 +9,7 @@ #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" +#include "sync/internal_api/public/sync_encryption_handler.h" #include "sync/protocol/sync_protocol_error.h" namespace syncer { @@ -84,6 +85,9 @@ struct SYNC_EXPORT SyncStatus { ModelTypeSet encrypted_types; bool cryptographer_ready; bool crypto_has_pending_keys; + bool has_keystore_key; + base::Time keystore_migration_time; + PassphraseType passphrase_type; // Per-datatype throttled status. ModelTypeSet throttled_types; -- cgit v1.1