OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 // | 4 // |
5 // Sync protocol for communication between sync client and server. | 5 // Sync protocol for communication between sync client and server. |
6 | 6 |
7 // Update proto_value_conversions{.h,.cc,_unittest.cc} if you change | 7 // Update proto_value_conversions{.h,.cc,_unittest.cc} if you change |
8 // any fields in this file. | 8 // any fields in this file. |
9 | 9 |
10 syntax = "proto2"; | 10 syntax = "proto2"; |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 // This flag is set if this GetUpdate request is due at least in part due | 485 // This flag is set if this GetUpdate request is due at least in part due |
486 // to the fact that this type has not finished initial sync yet, and the | 486 // to the fact that this type has not finished initial sync yet, and the |
487 // client would like to initialize itself with the server data. | 487 // client would like to initialize itself with the server data. |
488 // | 488 // |
489 // Only some types support performing an initial sync as part of a normal | 489 // Only some types support performing an initial sync as part of a normal |
490 // GetUpdate request. Many types must be in configure mode when fetching | 490 // GetUpdate request. Many types must be in configure mode when fetching |
491 // initial sync data. | 491 // initial sync data. |
492 // | 492 // |
493 // Introduced in M38. | 493 // Introduced in M38. |
494 optional bool initial_sync_in_progress = 7; | 494 optional bool initial_sync_in_progress = 7; |
495 | |
496 // This flag is set if this GetUpdate request is due to client receiving | |
497 // conflict response from server, so client needs to sync and then resolve | |
498 // conflict locally, and then commit again. | |
499 // | |
500 // Introduced in M42. | |
501 optional bool sync_for_resolve_conflict_in_progress = 8; | |
502 } | 495 } |
503 | 496 |
504 message GarbageCollectionDirective { | 497 message GarbageCollectionDirective { |
505 enum Type { | 498 enum Type { |
506 UNKNOWN = 0; | 499 UNKNOWN = 0; |
507 VERSION_WATERMARK = 1; | 500 VERSION_WATERMARK = 1; |
508 AGE_WATERMARK = 2; | 501 AGE_WATERMARK = 2; |
509 MAX_ITEM_COUNT = 3; | 502 MAX_ITEM_COUNT = 3; |
510 } | 503 } |
511 | 504 |
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
969 // Currently only meaningful if |error_type| is throttled. If this field | 962 // Currently only meaningful if |error_type| is throttled. If this field |
970 // is absent then the whole client (all datatypes) is throttled. | 963 // is absent then the whole client (all datatypes) is throttled. |
971 repeated int32 error_data_type_ids = 5; | 964 repeated int32 error_data_type_ids = 5; |
972 } | 965 } |
973 optional Error error = 13; | 966 optional Error error = 13; |
974 | 967 |
975 // The new per-client state for this client. If set, should be persisted and | 968 // The new per-client state for this client. If set, should be persisted and |
976 // sent with any subsequent ClientToServerMessages. | 969 // sent with any subsequent ClientToServerMessages. |
977 optional ChipBag new_bag_of_chips = 14; | 970 optional ChipBag new_bag_of_chips = 14; |
978 }; | 971 }; |
OLD | NEW |