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

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

Issue 76333002: Add Sync datatype for shared managed user settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years 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
« no previous file with comments | « sync/protocol/proto_value_conversions_unittest.cc ('k') | sync/sync_proto.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 17 matching lines...) Expand all
28 import "encryption.proto"; 28 import "encryption.proto";
29 import "experiments_specifics.proto"; 29 import "experiments_specifics.proto";
30 import "extension_setting_specifics.proto"; 30 import "extension_setting_specifics.proto";
31 import "extension_specifics.proto"; 31 import "extension_specifics.proto";
32 import "favicon_image_specifics.proto"; 32 import "favicon_image_specifics.proto";
33 import "favicon_tracking_specifics.proto"; 33 import "favicon_tracking_specifics.proto";
34 import "get_updates_caller_info.proto"; 34 import "get_updates_caller_info.proto";
35 import "history_delete_directive_specifics.proto"; 35 import "history_delete_directive_specifics.proto";
36 import "nigori_specifics.proto"; 36 import "nigori_specifics.proto";
37 import "managed_user_setting_specifics.proto"; 37 import "managed_user_setting_specifics.proto";
38 import "managed_user_shared_setting_specifics.proto";
38 import "managed_user_specifics.proto"; 39 import "managed_user_specifics.proto";
39 import "password_specifics.proto"; 40 import "password_specifics.proto";
40 import "preference_specifics.proto"; 41 import "preference_specifics.proto";
41 import "priority_preference_specifics.proto"; 42 import "priority_preference_specifics.proto";
42 import "search_engine_specifics.proto"; 43 import "search_engine_specifics.proto";
43 import "session_specifics.proto"; 44 import "session_specifics.proto";
44 import "sync_enums.proto"; 45 import "sync_enums.proto";
45 import "synced_notification_specifics.proto"; 46 import "synced_notification_specifics.proto";
46 import "theme_specifics.proto"; 47 import "theme_specifics.proto";
47 import "typed_url_specifics.proto"; 48 import "typed_url_specifics.proto";
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251; 114 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251;
114 optional SyncedNotificationSpecifics synced_notification = 153108; 115 optional SyncedNotificationSpecifics synced_notification = 153108;
115 optional DeviceInfoSpecifics device_info = 154522; 116 optional DeviceInfoSpecifics device_info = 154522;
116 optional ExperimentsSpecifics experiments = 161496; 117 optional ExperimentsSpecifics experiments = 161496;
117 optional PriorityPreferenceSpecifics priority_preference = 163425; 118 optional PriorityPreferenceSpecifics priority_preference = 163425;
118 optional DictionarySpecifics dictionary = 170540; 119 optional DictionarySpecifics dictionary = 170540;
119 optional FaviconTrackingSpecifics favicon_tracking = 181534; 120 optional FaviconTrackingSpecifics favicon_tracking = 181534;
120 optional FaviconImageSpecifics favicon_image = 182019; 121 optional FaviconImageSpecifics favicon_image = 182019;
121 optional ManagedUserSettingSpecifics managed_user_setting = 186662; 122 optional ManagedUserSettingSpecifics managed_user_setting = 186662;
122 optional ManagedUserSpecifics managed_user = 194582; 123 optional ManagedUserSpecifics managed_user = 194582;
124 optional ManagedUserSharedSettingSpecifics managed_user_shared_setting =
125 202026;
123 optional ArticleSpecifics article = 223759; 126 optional ArticleSpecifics article = 223759;
124 optional AppListSpecifics app_list = 229170; 127 optional AppListSpecifics app_list = 229170;
125 } 128 }
126 129
127 message SyncEntity { 130 message SyncEntity {
128 // This item's identifier. In a commit of a new item, this will be a 131 // This item's identifier. In a commit of a new item, this will be a
129 // client-generated ID. If the commit succeeds, the server will generate 132 // client-generated ID. If the commit succeeds, the server will generate
130 // a globally unique ID and return it to the committing client in the 133 // a globally unique ID and return it to the committing client in the
131 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse, 134 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse,
132 // |id_string| is always the server generated ID. The original 135 // |id_string| is always the server generated ID. The original
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 // is absent then the whole client (all datatypes) is throttled. 885 // is absent then the whole client (all datatypes) is throttled.
883 repeated int32 error_data_type_ids = 5; 886 repeated int32 error_data_type_ids = 5;
884 } 887 }
885 optional Error error = 13; 888 optional Error error = 13;
886 889
887 // The new per-client state for this client. If set, should be persisted and 890 // The new per-client state for this client. If set, should be persisted and
888 // sent with any subsequent ClientToServerMessages. 891 // sent with any subsequent ClientToServerMessages.
889 optional ChipBag new_bag_of_chips = 14; 892 optional ChipBag new_bag_of_chips = 14;
890 }; 893 };
891 894
OLDNEW
« no previous file with comments | « sync/protocol/proto_value_conversions_unittest.cc ('k') | sync/sync_proto.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698