summaryrefslogtreecommitdiffstats
path: root/sync/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'sync/protocol')
-rw-r--r--sync/protocol/nigori_specifics.proto6
-rw-r--r--sync/protocol/proto_value_conversions.cc1
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);