summaryrefslogtreecommitdiffstats
path: root/sync/protocol
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 23:48:12 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 23:48:12 +0000
commitde71c08fd406870753176a90f9fb84e3dbd645fa (patch)
tree2592190f8f028689a16e96ccf0e2ee2543456b74 /sync/protocol
parent118cfe57fe9e79b863f53be8500229adaf329334 (diff)
downloadchromium_src-de71c08fd406870753176a90f9fb84e3dbd645fa.zip
chromium_src-de71c08fd406870753176a90f9fb84e3dbd645fa.tar.gz
chromium_src-de71c08fd406870753176a90f9fb84e3dbd645fa.tar.bz2
[Sync] Move keystore key handling to SyncEncryptionHandlerImpl
The cryptographer has no notion of keystore keys, and we now persist the keystore key by reusing the OnBoostrapTokenUpdated method (which now takes an enum as an extra param specifying the type of token). BUG=129665 Review URL: https://chromiumcodereview.appspot.com/10878015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/protocol')
-rw-r--r--sync/protocol/client_debug_info.proto2
1 files changed, 2 insertions, 0 deletions
diff --git a/sync/protocol/client_debug_info.proto b/sync/protocol/client_debug_info.proto
index ceaf023..9792aaa 100644
--- a/sync/protocol/client_debug_info.proto
+++ b/sync/protocol/client_debug_info.proto
@@ -63,6 +63,8 @@ message DebugEventInfo {
BOOTSTRAP_TOKEN_UPDATED = 9; // A new cryptographer bootstrap token was
// generated.
PASSPHRASE_STATE_CHANGED = 10; // The encryption passphrase state changed.
+ KEYSTORE_TOKEN_UPDATED = 11; // A new keystore encryption token was
+ // persisted.
}
// In a given |DebugEventInfo| only one of the following would be set.
optional EventType type = 1;