| 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 20 matching lines...) Expand all Loading... |
| 31 import "extension_setting_specifics.proto"; | 31 import "extension_setting_specifics.proto"; |
| 32 import "extension_specifics.proto"; | 32 import "extension_specifics.proto"; |
| 33 import "favicon_image_specifics.proto"; | 33 import "favicon_image_specifics.proto"; |
| 34 import "favicon_tracking_specifics.proto"; | 34 import "favicon_tracking_specifics.proto"; |
| 35 import "get_updates_caller_info.proto"; | 35 import "get_updates_caller_info.proto"; |
| 36 import "history_delete_directive_specifics.proto"; | 36 import "history_delete_directive_specifics.proto"; |
| 37 import "nigori_specifics.proto"; | 37 import "nigori_specifics.proto"; |
| 38 import "managed_user_setting_specifics.proto"; | 38 import "managed_user_setting_specifics.proto"; |
| 39 import "managed_user_shared_setting_specifics.proto"; | 39 import "managed_user_shared_setting_specifics.proto"; |
| 40 import "managed_user_specifics.proto"; | 40 import "managed_user_specifics.proto"; |
| 41 import "managed_user_whitelist_specifics.proto"; |
| 41 import "password_specifics.proto"; | 42 import "password_specifics.proto"; |
| 42 import "preference_specifics.proto"; | 43 import "preference_specifics.proto"; |
| 43 import "priority_preference_specifics.proto"; | 44 import "priority_preference_specifics.proto"; |
| 44 import "search_engine_specifics.proto"; | 45 import "search_engine_specifics.proto"; |
| 45 import "session_specifics.proto"; | 46 import "session_specifics.proto"; |
| 46 import "sync_enums.proto"; | 47 import "sync_enums.proto"; |
| 47 import "synced_notification_app_info_specifics.proto"; | 48 import "synced_notification_app_info_specifics.proto"; |
| 48 import "synced_notification_specifics.proto"; | 49 import "synced_notification_specifics.proto"; |
| 49 import "theme_specifics.proto"; | 50 import "theme_specifics.proto"; |
| 50 import "typed_url_specifics.proto"; | 51 import "typed_url_specifics.proto"; |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 optional DeviceInfoSpecifics device_info = 154522; | 121 optional DeviceInfoSpecifics device_info = 154522; |
| 121 optional ExperimentsSpecifics experiments = 161496; | 122 optional ExperimentsSpecifics experiments = 161496; |
| 122 optional PriorityPreferenceSpecifics priority_preference = 163425; | 123 optional PriorityPreferenceSpecifics priority_preference = 163425; |
| 123 optional DictionarySpecifics dictionary = 170540; | 124 optional DictionarySpecifics dictionary = 170540; |
| 124 optional FaviconTrackingSpecifics favicon_tracking = 181534; | 125 optional FaviconTrackingSpecifics favicon_tracking = 181534; |
| 125 optional FaviconImageSpecifics favicon_image = 182019; | 126 optional FaviconImageSpecifics favicon_image = 182019; |
| 126 optional ManagedUserSettingSpecifics managed_user_setting = 186662; | 127 optional ManagedUserSettingSpecifics managed_user_setting = 186662; |
| 127 optional ManagedUserSpecifics managed_user = 194582; | 128 optional ManagedUserSpecifics managed_user = 194582; |
| 128 optional ManagedUserSharedSettingSpecifics managed_user_shared_setting = | 129 optional ManagedUserSharedSettingSpecifics managed_user_shared_setting = |
| 129 202026; | 130 202026; |
| 131 optional ManagedUserWhitelistSpecifics managed_user_whitelist = 306060; |
| 130 optional ArticleSpecifics article = 223759; | 132 optional ArticleSpecifics article = 223759; |
| 131 optional AppListSpecifics app_list = 229170; | 133 optional AppListSpecifics app_list = 229170; |
| 132 optional WifiCredentialSpecifics wifi_credential = 218175; | 134 optional WifiCredentialSpecifics wifi_credential = 218175; |
| 133 optional AutofillWalletSpecifics autofill_wallet = 306270; | 135 optional AutofillWalletSpecifics autofill_wallet = 306270; |
| 134 } | 136 } |
| 135 | 137 |
| 136 message SyncEntity { | 138 message SyncEntity { |
| 137 // This item's identifier. In a commit of a new item, this will be a | 139 // This item's identifier. In a commit of a new item, this will be a |
| 138 // client-generated ID. If the commit succeeds, the server will generate | 140 // client-generated ID. If the commit succeeds, the server will generate |
| 139 // a globally unique ID and return it to the committing client in the | 141 // a globally unique ID and return it to the committing client in the |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 960 // Currently only meaningful if |error_type| is throttled. If this field | 962 // Currently only meaningful if |error_type| is throttled. If this field |
| 961 // is absent then the whole client (all datatypes) is throttled. | 963 // is absent then the whole client (all datatypes) is throttled. |
| 962 repeated int32 error_data_type_ids = 5; | 964 repeated int32 error_data_type_ids = 5; |
| 963 } | 965 } |
| 964 optional Error error = 13; | 966 optional Error error = 13; |
| 965 | 967 |
| 966 // 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 |
| 967 // sent with any subsequent ClientToServerMessages. | 969 // sent with any subsequent ClientToServerMessages. |
| 968 optional ChipBag new_bag_of_chips = 14; | 970 optional ChipBag new_bag_of_chips = 14; |
| 969 }; | 971 }; |
| OLD | NEW |