| 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 10 matching lines...) Expand all Loading... |
| 21 import "bookmark_specifics.proto"; | 21 import "bookmark_specifics.proto"; |
| 22 import "client_commands.proto"; | 22 import "client_commands.proto"; |
| 23 import "client_debug_info.proto"; | 23 import "client_debug_info.proto"; |
| 24 import "device_info_specifics.proto"; | 24 import "device_info_specifics.proto"; |
| 25 import "dictionary_specifics.proto"; | 25 import "dictionary_specifics.proto"; |
| 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 "get_updates_caller_info.proto"; | 30 import "get_updates_caller_info.proto"; |
| 31 import "favicon_specifics.proto"; |
| 31 import "history_delete_directive_specifics.proto"; | 32 import "history_delete_directive_specifics.proto"; |
| 32 import "nigori_specifics.proto"; | 33 import "nigori_specifics.proto"; |
| 33 import "password_specifics.proto"; | 34 import "password_specifics.proto"; |
| 34 import "preference_specifics.proto"; | 35 import "preference_specifics.proto"; |
| 35 import "priority_preference_specifics.proto"; | 36 import "priority_preference_specifics.proto"; |
| 36 import "search_engine_specifics.proto"; | 37 import "search_engine_specifics.proto"; |
| 37 import "session_specifics.proto"; | 38 import "session_specifics.proto"; |
| 38 import "sync_enums.proto"; | 39 import "sync_enums.proto"; |
| 39 import "synced_notification_specifics.proto"; | 40 import "synced_notification_specifics.proto"; |
| 40 import "theme_specifics.proto"; | 41 import "theme_specifics.proto"; |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 optional AutofillProfileSpecifics autofill_profile = 63951; | 104 optional AutofillProfileSpecifics autofill_profile = 63951; |
| 104 optional SearchEngineSpecifics search_engine = 88610; | 105 optional SearchEngineSpecifics search_engine = 88610; |
| 105 optional ExtensionSettingSpecifics extension_setting = 96159; | 106 optional ExtensionSettingSpecifics extension_setting = 96159; |
| 106 optional AppSettingSpecifics app_setting = 103656; | 107 optional AppSettingSpecifics app_setting = 103656; |
| 107 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251; | 108 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251; |
| 108 optional SyncedNotificationSpecifics synced_notification = 153108; | 109 optional SyncedNotificationSpecifics synced_notification = 153108; |
| 109 optional DeviceInfoSpecifics device_info = 154522; | 110 optional DeviceInfoSpecifics device_info = 154522; |
| 110 optional ExperimentsSpecifics experiments = 161496; | 111 optional ExperimentsSpecifics experiments = 161496; |
| 111 optional PriorityPreferenceSpecifics priority_preference = 163425; | 112 optional PriorityPreferenceSpecifics priority_preference = 163425; |
| 112 optional DictionarySpecifics dictionary = 170540; | 113 optional DictionarySpecifics dictionary = 170540; |
| 114 optional FaviconSpecifics favicon = 179800; |
| 113 } | 115 } |
| 114 | 116 |
| 115 message SyncEntity { | 117 message SyncEntity { |
| 116 // This item's identifier. In a commit of a new item, this will be a | 118 // This item's identifier. In a commit of a new item, this will be a |
| 117 // client-generated ID. If the commit succeeds, the server will generate | 119 // client-generated ID. If the commit succeeds, the server will generate |
| 118 // a globally unique ID and return it to the committing client in the | 120 // a globally unique ID and return it to the committing client in the |
| 119 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse, | 121 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse, |
| 120 // |id_string| is always the server generated ID. The original | 122 // |id_string| is always the server generated ID. The original |
| 121 // client-generated ID is preserved in the |originator_client_id| field. | 123 // client-generated ID is preserved in the |originator_client_id| field. |
| 122 // Present in both GetUpdatesResponse and CommitMessage. | 124 // Present in both GetUpdatesResponse and CommitMessage. |
| (...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 756 // is absent then the whole client (all datatypes) is throttled. | 758 // is absent then the whole client (all datatypes) is throttled. |
| 757 repeated int32 error_data_type_ids = 5; | 759 repeated int32 error_data_type_ids = 5; |
| 758 } | 760 } |
| 759 optional Error error = 13; | 761 optional Error error = 13; |
| 760 | 762 |
| 761 // The new per-client state for this client. If set, should be persisted and | 763 // The new per-client state for this client. If set, should be persisted and |
| 762 // sent with any subsequent ClientToServerMessages. | 764 // sent with any subsequent ClientToServerMessages. |
| 763 optional ChipBag new_bag_of_chips = 14; | 765 optional ChipBag new_bag_of_chips = 14; |
| 764 }; | 766 }; |
| 765 | 767 |
| OLD | NEW |