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 15 matching lines...) Expand all Loading... |
26 import "encryption.proto"; | 26 import "encryption.proto"; |
27 import "experiments_specifics.proto"; | 27 import "experiments_specifics.proto"; |
28 import "extension_setting_specifics.proto"; | 28 import "extension_setting_specifics.proto"; |
29 import "extension_specifics.proto"; | 29 import "extension_specifics.proto"; |
30 import "favicon_image_specifics.proto"; | 30 import "favicon_image_specifics.proto"; |
31 import "favicon_tracking_specifics.proto"; | 31 import "favicon_tracking_specifics.proto"; |
32 import "get_updates_caller_info.proto"; | 32 import "get_updates_caller_info.proto"; |
33 import "history_delete_directive_specifics.proto"; | 33 import "history_delete_directive_specifics.proto"; |
34 import "nigori_specifics.proto"; | 34 import "nigori_specifics.proto"; |
35 import "managed_user_setting_specifics.proto"; | 35 import "managed_user_setting_specifics.proto"; |
| 36 import "managed_user_specifics.proto"; |
36 import "password_specifics.proto"; | 37 import "password_specifics.proto"; |
37 import "preference_specifics.proto"; | 38 import "preference_specifics.proto"; |
38 import "priority_preference_specifics.proto"; | 39 import "priority_preference_specifics.proto"; |
39 import "search_engine_specifics.proto"; | 40 import "search_engine_specifics.proto"; |
40 import "session_specifics.proto"; | 41 import "session_specifics.proto"; |
41 import "sync_enums.proto"; | 42 import "sync_enums.proto"; |
42 import "synced_notification_specifics.proto"; | 43 import "synced_notification_specifics.proto"; |
43 import "theme_specifics.proto"; | 44 import "theme_specifics.proto"; |
44 import "typed_url_specifics.proto"; | 45 import "typed_url_specifics.proto"; |
45 import "unique_position.proto"; | 46 import "unique_position.proto"; |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 optional AppSettingSpecifics app_setting = 103656; | 110 optional AppSettingSpecifics app_setting = 103656; |
110 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251; | 111 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251; |
111 optional SyncedNotificationSpecifics synced_notification = 153108; | 112 optional SyncedNotificationSpecifics synced_notification = 153108; |
112 optional DeviceInfoSpecifics device_info = 154522; | 113 optional DeviceInfoSpecifics device_info = 154522; |
113 optional ExperimentsSpecifics experiments = 161496; | 114 optional ExperimentsSpecifics experiments = 161496; |
114 optional PriorityPreferenceSpecifics priority_preference = 163425; | 115 optional PriorityPreferenceSpecifics priority_preference = 163425; |
115 optional DictionarySpecifics dictionary = 170540; | 116 optional DictionarySpecifics dictionary = 170540; |
116 optional FaviconTrackingSpecifics favicon_tracking = 181534; | 117 optional FaviconTrackingSpecifics favicon_tracking = 181534; |
117 optional FaviconImageSpecifics favicon_image = 182019; | 118 optional FaviconImageSpecifics favicon_image = 182019; |
118 optional ManagedUserSettingSpecifics managed_user_setting = 186662; | 119 optional ManagedUserSettingSpecifics managed_user_setting = 186662; |
| 120 optional ManagedUserSpecifics managed_user = 194582; |
119 } | 121 } |
120 | 122 |
121 message SyncEntity { | 123 message SyncEntity { |
122 // This item's identifier. In a commit of a new item, this will be a | 124 // This item's identifier. In a commit of a new item, this will be a |
123 // client-generated ID. If the commit succeeds, the server will generate | 125 // client-generated ID. If the commit succeeds, the server will generate |
124 // a globally unique ID and return it to the committing client in the | 126 // a globally unique ID and return it to the committing client in the |
125 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse, | 127 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse, |
126 // |id_string| is always the server generated ID. The original | 128 // |id_string| is always the server generated ID. The original |
127 // client-generated ID is preserved in the |originator_client_id| field. | 129 // client-generated ID is preserved in the |originator_client_id| field. |
128 // Present in both GetUpdatesResponse and CommitMessage. | 130 // Present in both GetUpdatesResponse and CommitMessage. |
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
855 // is absent then the whole client (all datatypes) is throttled. | 857 // is absent then the whole client (all datatypes) is throttled. |
856 repeated int32 error_data_type_ids = 5; | 858 repeated int32 error_data_type_ids = 5; |
857 } | 859 } |
858 optional Error error = 13; | 860 optional Error error = 13; |
859 | 861 |
860 // The new per-client state for this client. If set, should be persisted and | 862 // The new per-client state for this client. If set, should be persisted and |
861 // sent with any subsequent ClientToServerMessages. | 863 // sent with any subsequent ClientToServerMessages. |
862 optional ChipBag new_bag_of_chips = 14; | 864 optional ChipBag new_bag_of_chips = 14; |
863 }; | 865 }; |
864 | 866 |
OLD | NEW |