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 16 matching lines...) Expand all Loading... |
27 import "encryption.proto"; | 27 import "encryption.proto"; |
28 import "experiments_specifics.proto"; | 28 import "experiments_specifics.proto"; |
29 import "extension_setting_specifics.proto"; | 29 import "extension_setting_specifics.proto"; |
30 import "extension_specifics.proto"; | 30 import "extension_specifics.proto"; |
31 import "favicon_image_specifics.proto"; | 31 import "favicon_image_specifics.proto"; |
32 import "favicon_tracking_specifics.proto"; | 32 import "favicon_tracking_specifics.proto"; |
33 import "get_updates_caller_info.proto"; | 33 import "get_updates_caller_info.proto"; |
34 import "history_delete_directive_specifics.proto"; | 34 import "history_delete_directive_specifics.proto"; |
35 import "nigori_specifics.proto"; | 35 import "nigori_specifics.proto"; |
36 import "managed_user_setting_specifics.proto"; | 36 import "managed_user_setting_specifics.proto"; |
| 37 import "managed_user_shared_setting_specifics.proto"; |
37 import "managed_user_specifics.proto"; | 38 import "managed_user_specifics.proto"; |
38 import "password_specifics.proto"; | 39 import "password_specifics.proto"; |
39 import "preference_specifics.proto"; | 40 import "preference_specifics.proto"; |
40 import "priority_preference_specifics.proto"; | 41 import "priority_preference_specifics.proto"; |
41 import "search_engine_specifics.proto"; | 42 import "search_engine_specifics.proto"; |
42 import "session_specifics.proto"; | 43 import "session_specifics.proto"; |
43 import "sync_enums.proto"; | 44 import "sync_enums.proto"; |
44 import "synced_notification_specifics.proto"; | 45 import "synced_notification_specifics.proto"; |
45 import "theme_specifics.proto"; | 46 import "theme_specifics.proto"; |
46 import "typed_url_specifics.proto"; | 47 import "typed_url_specifics.proto"; |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251; | 113 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251; |
113 optional SyncedNotificationSpecifics synced_notification = 153108; | 114 optional SyncedNotificationSpecifics synced_notification = 153108; |
114 optional DeviceInfoSpecifics device_info = 154522; | 115 optional DeviceInfoSpecifics device_info = 154522; |
115 optional ExperimentsSpecifics experiments = 161496; | 116 optional ExperimentsSpecifics experiments = 161496; |
116 optional PriorityPreferenceSpecifics priority_preference = 163425; | 117 optional PriorityPreferenceSpecifics priority_preference = 163425; |
117 optional DictionarySpecifics dictionary = 170540; | 118 optional DictionarySpecifics dictionary = 170540; |
118 optional FaviconTrackingSpecifics favicon_tracking = 181534; | 119 optional FaviconTrackingSpecifics favicon_tracking = 181534; |
119 optional FaviconImageSpecifics favicon_image = 182019; | 120 optional FaviconImageSpecifics favicon_image = 182019; |
120 optional ManagedUserSettingSpecifics managed_user_setting = 186662; | 121 optional ManagedUserSettingSpecifics managed_user_setting = 186662; |
121 optional ManagedUserSpecifics managed_user = 194582; | 122 optional ManagedUserSpecifics managed_user = 194582; |
| 123 optional ManagedUserSharedSettingSpecifics managed_user_shared_setting = |
| 124 202026; |
122 optional ArticleSpecifics article = 223759; | 125 optional ArticleSpecifics article = 223759; |
123 } | 126 } |
124 | 127 |
125 message SyncEntity { | 128 message SyncEntity { |
126 // This item's identifier. In a commit of a new item, this will be a | 129 // This item's identifier. In a commit of a new item, this will be a |
127 // client-generated ID. If the commit succeeds, the server will generate | 130 // client-generated ID. If the commit succeeds, the server will generate |
128 // a globally unique ID and return it to the committing client in the | 131 // a globally unique ID and return it to the committing client in the |
129 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse, | 132 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse, |
130 // |id_string| is always the server generated ID. The original | 133 // |id_string| is always the server generated ID. The original |
131 // client-generated ID is preserved in the |originator_client_id| field. | 134 // client-generated ID is preserved in the |originator_client_id| field. |
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
884 // is absent then the whole client (all datatypes) is throttled. | 887 // is absent then the whole client (all datatypes) is throttled. |
885 repeated int32 error_data_type_ids = 5; | 888 repeated int32 error_data_type_ids = 5; |
886 } | 889 } |
887 optional Error error = 13; | 890 optional Error error = 13; |
888 | 891 |
889 // The new per-client state for this client. If set, should be persisted and | 892 // The new per-client state for this client. If set, should be persisted and |
890 // sent with any subsequent ClientToServerMessages. | 893 // sent with any subsequent ClientToServerMessages. |
891 optional ChipBag new_bag_of_chips = 14; | 894 optional ChipBag new_bag_of_chips = 14; |
892 }; | 895 }; |
893 | 896 |
OLD | NEW |