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

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

Issue 11734009: sync: Add ControlPreference protobuf and supporting code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Daily rebase Created 7 years, 11 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
« no previous file with comments | « sync/protocol/proto_value_conversions_unittest.cc ('k') | sync/protocol/sync_proto.gyp » ('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 13 matching lines...) Expand all
24 import "device_info_specifics.proto"; 24 import "device_info_specifics.proto";
25 import "encryption.proto"; 25 import "encryption.proto";
26 import "experiments_specifics.proto"; 26 import "experiments_specifics.proto";
27 import "extension_setting_specifics.proto"; 27 import "extension_setting_specifics.proto";
28 import "extension_specifics.proto"; 28 import "extension_specifics.proto";
29 import "get_updates_caller_info.proto"; 29 import "get_updates_caller_info.proto";
30 import "history_delete_directive_specifics.proto"; 30 import "history_delete_directive_specifics.proto";
31 import "nigori_specifics.proto"; 31 import "nigori_specifics.proto";
32 import "password_specifics.proto"; 32 import "password_specifics.proto";
33 import "preference_specifics.proto"; 33 import "preference_specifics.proto";
34 import "priority_preference_specifics.proto";
34 import "search_engine_specifics.proto"; 35 import "search_engine_specifics.proto";
35 import "session_specifics.proto"; 36 import "session_specifics.proto";
36 import "sync_enums.proto"; 37 import "sync_enums.proto";
37 import "synced_notification_specifics.proto"; 38 import "synced_notification_specifics.proto";
38 import "theme_specifics.proto"; 39 import "theme_specifics.proto";
39 import "typed_url_specifics.proto"; 40 import "typed_url_specifics.proto";
40 41
41 // Used for inspecting how long we spent performing operations in different 42 // Used for inspecting how long we spent performing operations in different
42 // backends. All times must be in millis. 43 // backends. All times must be in millis.
43 message ProfilingData { 44 message ProfilingData {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 optional AppSpecifics app = 48364; 99 optional AppSpecifics app = 48364;
99 optional SessionSpecifics session = 50119; 100 optional SessionSpecifics session = 50119;
100 optional AutofillProfileSpecifics autofill_profile = 63951; 101 optional AutofillProfileSpecifics autofill_profile = 63951;
101 optional SearchEngineSpecifics search_engine = 88610; 102 optional SearchEngineSpecifics search_engine = 88610;
102 optional ExtensionSettingSpecifics extension_setting = 96159; 103 optional ExtensionSettingSpecifics extension_setting = 96159;
103 optional AppSettingSpecifics app_setting = 103656; 104 optional AppSettingSpecifics app_setting = 103656;
104 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251; 105 optional HistoryDeleteDirectiveSpecifics history_delete_directive = 150251;
105 optional SyncedNotificationSpecifics synced_notification = 153108; 106 optional SyncedNotificationSpecifics synced_notification = 153108;
106 optional DeviceInfoSpecifics device_info = 154522; 107 optional DeviceInfoSpecifics device_info = 154522;
107 optional ExperimentsSpecifics experiments = 161496; 108 optional ExperimentsSpecifics experiments = 161496;
109 optional PriorityPreferenceSpecifics priority_preference = 163425;
108 } 110 }
109 111
110 message SyncEntity { 112 message SyncEntity {
111 // This item's identifier. In a commit of a new item, this will be a 113 // This item's identifier. In a commit of a new item, this will be a
112 // client-generated ID. If the commit succeeds, the server will generate 114 // client-generated ID. If the commit succeeds, the server will generate
113 // a globally unique ID and return it to the committing client in the 115 // a globally unique ID and return it to the committing client in the
114 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse, 116 // CommitResponse.EntryResponse. In the context of a GetUpdatesResponse,
115 // |id_string| is always the server generated ID. The original 117 // |id_string| is always the server generated ID. The original
116 // client-generated ID is preserved in the |originator_client_id| field. 118 // client-generated ID is preserved in the |originator_client_id| field.
117 // Present in both GetUpdatesResponse and CommitMessage. 119 // Present in both GetUpdatesResponse and CommitMessage.
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 // is absent then the whole client (all datatypes) is throttled. 745 // is absent then the whole client (all datatypes) is throttled.
744 repeated int32 error_data_type_ids = 5; 746 repeated int32 error_data_type_ids = 5;
745 } 747 }
746 optional Error error = 13; 748 optional Error error = 13;
747 749
748 // The new per-client state for this client. If set, should be persisted and 750 // The new per-client state for this client. If set, should be persisted and
749 // sent with any subsequent ClientToServerMessages. 751 // sent with any subsequent ClientToServerMessages.
750 optional ChipBag new_bag_of_chips = 14; 752 optional ChipBag new_bag_of_chips = 14;
751 }; 753 };
752 754
OLDNEW
« no previous file with comments | « sync/protocol/proto_value_conversions_unittest.cc ('k') | sync/protocol/sync_proto.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698