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

Unified Diff: sync/internal_api/sync_encryption_handler_impl.h

Issue 10917246: [Sync] Add keystore encryption info to about:sync (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
« no previous file with comments | « sync/internal_api/public/engine/sync_status.cc ('k') | sync/internal_api/sync_encryption_handler_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_encryption_handler_impl.h
diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h
index f54055b9afdaab82647e0088a353b499de792524..27f7080078fdb65596fd8240ce3fb53f5694e22d 100644
--- a/sync/internal_api/sync_encryption_handler_impl.h
+++ b/sync/internal_api/sync_encryption_handler_impl.h
@@ -9,6 +9,7 @@
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
+#include "base/time.h"
#include "base/threading/thread_checker.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
@@ -62,9 +63,6 @@ class SyncEncryptionHandlerImpl
virtual bool EncryptEverythingEnabled() const OVERRIDE;
virtual PassphraseType GetPassphraseType() const OVERRIDE;
- // TODO(zea): provide a method for getting the time at which the nigori
- // node was migrated.
-
// NigoriHandler implementation.
// Note: all methods are invoked while the caller holds a transaction.
virtual void ApplyNigoriUpdate(
@@ -88,6 +86,7 @@ class SyncEncryptionHandlerImpl
ModelTypeSet GetEncryptedTypesUnsafe();
bool MigratedToKeystore();
+ base::Time migration_time() const;
private:
FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
@@ -287,8 +286,8 @@ class SyncEncryptionHandlerImpl
// instantiation.
int nigori_overwrite_count_;
- // The time (in ms) the nigori was migrated to support keystore encryption.
- int64 migration_time_ms_;
+ // The time the nigori was migrated to support keystore encryption.
+ base::Time migration_time_;
DISALLOW_COPY_AND_ASSIGN(SyncEncryptionHandlerImpl);
};
« no previous file with comments | « sync/internal_api/public/engine/sync_status.cc ('k') | sync/internal_api/sync_encryption_handler_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698