diff options
| author | timonvo <timonvo@chromium.org> | 2015-07-29 19:21:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-30 02:22:38 +0000 |
| commit | b53453ced1c220f8e6f9b2f580c9feba3b66d145 (patch) | |
| tree | 2db9388e695f400f284ee57d7ad78dc667674b5b /sync/protocol | |
| parent | ad149261e8c6a782703eb3a09a801aa958d12f64 (diff) | |
| download | chromium_src-b53453ced1c220f8e6f9b2f580c9feba3b66d145.zip chromium_src-b53453ced1c220f8e6f9b2f580c9feba3b66d145.tar.gz chromium_src-b53453ced1c220f8e6f9b2f580c9feba3b66d145.tar.bz2 | |
[sync] Add was_missing_keystore_migration_time field to NigoriSpecifics.
R=zea@chromium.org
BUG=512197
Review URL: https://codereview.chromium.org/1260103003
Cr-Commit-Position: refs/heads/master@{#341053}
Diffstat (limited to 'sync/protocol')
| -rw-r--r-- | sync/protocol/nigori_specifics.proto | 6 | ||||
| -rw-r--r-- | sync/protocol/proto_value_conversions.cc | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sync/protocol/nigori_specifics.proto b/sync/protocol/nigori_specifics.proto index eaefe78..12c2ecf 100644 --- a/sync/protocol/nigori_specifics.proto +++ b/sync/protocol/nigori_specifics.proto @@ -132,5 +132,11 @@ message NigoriSpecifics { // Boolean corresponding to whether usage count and last use date of Wallet // data should be encrypted. optional bool encrypt_autofill_wallet_metadata = 39; + + // Boolean indicating whether this node was originally missing a + // |keystore_migration_time| field value, and was fixed on the server by + // giving the field a value. + // THIS FIELD SHOULD ONLY BE SET BY THE SERVER. + optional bool server_only_was_missing_keystore_migration_time = 40; } diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc index b6b23ed..e7dddcd 100644 --- a/sync/protocol/proto_value_conversions.cc +++ b/sync/protocol/proto_value_conversions.cc @@ -572,6 +572,7 @@ scoped_ptr<base::DictionaryValue> NigoriSpecificsToValue( SET_BOOL(encrypt_articles); SET_BOOL(encrypt_app_list); SET_BOOL(encrypt_everything); + SET_BOOL(server_only_was_missing_keystore_migration_time); SET_BOOL(sync_tab_favicons); SET_ENUM(passphrase_type, PassphraseTypeString); SET(keystore_decryptor_token, EncryptedDataToValue); |