Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: sync/protocol/sync.proto

Issue 14053004: Add ManagedUserSettings Sync data type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 14 matching lines...) Expand all
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 "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 "password_specifics.proto"; 36 import "password_specifics.proto";
36 import "preference_specifics.proto"; 37 import "preference_specifics.proto";
37 import "priority_preference_specifics.proto"; 38 import "priority_preference_specifics.proto";
38 import "search_engine_specifics.proto"; 39 import "search_engine_specifics.proto";
39 import "session_specifics.proto"; 40 import "session_specifics.proto";
40 import "sync_enums.proto"; 41 import "sync_enums.proto";
41 import "synced_notification_specifics.proto"; 42 import "synced_notification_specifics.proto";
42 import "theme_specifics.proto"; 43 import "theme_specifics.proto";
43 import "typed_url_specifics.proto"; 44 import "typed_url_specifics.proto";
44 import "unique_position.proto"; 45 import "unique_position.proto";
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 optional ExtensionSettingSpecifics extension_setting = 96159; 108 optional ExtensionSettingSpecifics extension_setting = 96159;
108 optional AppSettingSpecifics app_setting = 103656; 109 optional AppSettingSpecifics app_setting = 103656;
109 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251; 110 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251;
110 optional SyncedNotificationSpecifics synced_notification = 153108; 111 optional SyncedNotificationSpecifics synced_notification = 153108;
111 optional DeviceInfoSpecifics device_info = 154522; 112 optional DeviceInfoSpecifics device_info = 154522;
112 optional ExperimentsSpecifics experiments = 161496; 113 optional ExperimentsSpecifics experiments = 161496;
113 optional PriorityPreferenceSpecifics priority_preference = 163425; 114 optional PriorityPreferenceSpecifics priority_preference = 163425;
114 optional DictionarySpecifics dictionary = 170540; 115 optional DictionarySpecifics dictionary = 170540;
115 optional FaviconTrackingSpecifics favicon_tracking = 181534; 116 optional FaviconTrackingSpecifics favicon_tracking = 181534;
116 optional FaviconImageSpecifics favicon_image = 182019; 117 optional FaviconImageSpecifics favicon_image = 182019;
118 optional ManagedUserSettingSpecifics managed_user_setting = 186662;
117 } 119 }
118 120
119 message SyncEntity { 121 message SyncEntity {
120 // This item's identifier. In a commit of a new item, this will be a 122 // This item's identifier. In a commit of a new item, this will be a
121 // client-generated ID. If the commit succeeds, the server will generate 123 // client-generated ID. If the commit succeeds, the server will generate
122 // a globally unique ID and return it to the committing client in the 124 // a globally unique ID and return it to the committing client in the
123 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse, 125 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse,
124 // |id_string| is always the server generated ID. The original 126 // |id_string| is always the server generated ID. The original
125 // client-generated ID is preserved in the |originator_client_id| field. 127 // client-generated ID is preserved in the |originator_client_id| field.
126 // Present in both GetUpdatesResponse and CommitMessage. 128 // Present in both GetUpdatesResponse and CommitMessage.
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 // is absent then the whole client (all datatypes) is throttled. 772 // is absent then the whole client (all datatypes) is throttled.
771 repeated int32 error_data_type_ids = 5; 773 repeated int32 error_data_type_ids = 5;
772 } 774 }
773 optional Error error = 13; 775 optional Error error = 13;
774 776
775 // The new per-client state for this client. If set, should be persisted and 777 // The new per-client state for this client. If set, should be persisted and
776 // sent with any subsequent ClientToServerMessages. 778 // sent with any subsequent ClientToServerMessages.
777 optional ChipBag new_bag_of_chips = 14; 779 optional ChipBag new_bag_of_chips = 14;
778 }; 780 };
779 781
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698