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

Unified Diff: chrome/browser/sync/about_sync_util.cc

Issue 10917246: [Sync] Add keystore encryption info to about:sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make const 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
« no previous file with comments | « no previous file | sync/engine/all_status.h » ('j') | sync/internal_api/public/engine/sync_status.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/about_sync_util.cc
diff --git a/chrome/browser/sync/about_sync_util.cc b/chrome/browser/sync/about_sync_util.cc
index c0487ad91bc8f8a3779af8d33736d3fab18caac1..d3745f7bca8e157eda16de651ad77da08c46edc7 100644
--- a/chrome/browser/sync/about_sync_util.cc
+++ b/chrome/browser/sync/about_sync_util.cc
@@ -193,6 +193,11 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
BoolSyncStat has_pending_keys(section_encryption,
"Cryptographer Has Pending Keys");
StringSyncStat encrypted_types(section_encryption, "Encrypted Types");
+ BoolSyncStat has_keystore_key(section_encryption, "Has Keystore Key");
+ StringSyncStat keystore_migration_time(section_encryption,
+ "Keystore Migration Time");
+ StringSyncStat passphrase_type(section_encryption,
+ "Passphrase Type");
ListValue* section_last_session = AddSection(
stats_list, "Status from Last Completed Session");
@@ -293,6 +298,9 @@ scoped_ptr<DictionaryValue> ConstructAboutInformation(
has_pending_keys.SetValue(full_status.crypto_has_pending_keys);
encrypted_types.SetValue(
ModelTypeSetToString(full_status.encrypted_types));
+ has_keystore_key.SetValue(full_status.has_keystore_key);
+ keystore_migration_time.SetValue(full_status.keystore_migration_time);
akalin 2012/09/17 18:07:20 yeah, I think the string convs should happen here
Nicolas Zea 2012/09/17 21:00:24 Done.
+ passphrase_type.SetValue(full_status.passphrase_type);
}
if (snapshot.is_initialized()) {
« no previous file with comments | « no previous file | sync/engine/all_status.h » ('j') | sync/internal_api/public/engine/sync_status.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698