| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef SYNC_ENGINE_NON_BLOCKING_SYNC_COMMON_H_ | 5 #ifndef SYNC_ENGINE_NON_BLOCKING_SYNC_COMMON_H_ | 
| 6 #define SYNC_ENGINE_NON_BLOCKING_SYNC_COMMON_H_ | 6 #define SYNC_ENGINE_NON_BLOCKING_SYNC_COMMON_H_ | 
| 7 | 7 | 
| 8 #include <string> | 8 #include <string> | 
| 9 #include <vector> | 9 #include <vector> | 
| 10 | 10 | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
| 40 | 40 | 
| 41   // A strictly increasing counter used to generate unique values for the | 41   // A strictly increasing counter used to generate unique values for the | 
| 42   // client-assigned IDs.  The incrementing and ID assignment happens on the | 42   // client-assigned IDs.  The incrementing and ID assignment happens on the | 
| 43   // sync thread, but we store the value here so we can pass it back to the | 43   // sync thread, but we store the value here so we can pass it back to the | 
| 44   // model thread for persistence.  This is probably unnecessary for the | 44   // model thread for persistence.  This is probably unnecessary for the | 
| 45   // client-tagged data types supported by non-blocking sync, but we will | 45   // client-tagged data types supported by non-blocking sync, but we will | 
| 46   // continue to emulate the directory sync's behavior for now. | 46   // continue to emulate the directory sync's behavior for now. | 
| 47   int64 next_client_id; | 47   int64 next_client_id; | 
| 48 | 48 | 
| 49   // This flag is set to true when the first download cycle is complete.  The | 49   // This flag is set to true when the first download cycle is complete.  The | 
| 50   // NonBlockingTypeProcessor should not attempt to commit any items until this | 50   // ModelTypeSyncProxy should not attempt to commit any items until this | 
| 51   // flag is set. | 51   // flag is set. | 
| 52   bool initial_sync_done; | 52   bool initial_sync_done; | 
| 53 }; | 53 }; | 
| 54 | 54 | 
| 55 struct SYNC_EXPORT_PRIVATE CommitRequestData { | 55 struct SYNC_EXPORT_PRIVATE CommitRequestData { | 
| 56   CommitRequestData(); | 56   CommitRequestData(); | 
| 57   ~CommitRequestData(); | 57   ~CommitRequestData(); | 
| 58 | 58 | 
| 59   std::string id; | 59   std::string id; | 
| 60   std::string client_tag_hash; | 60   std::string client_tag_hash; | 
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 96   sync_pb::EntitySpecifics specifics; | 96   sync_pb::EntitySpecifics specifics; | 
| 97 }; | 97 }; | 
| 98 | 98 | 
| 99 typedef std::vector<CommitRequestData> CommitRequestDataList; | 99 typedef std::vector<CommitRequestData> CommitRequestDataList; | 
| 100 typedef std::vector<CommitResponseData> CommitResponseDataList; | 100 typedef std::vector<CommitResponseData> CommitResponseDataList; | 
| 101 typedef std::vector<UpdateResponseData> UpdateResponseDataList; | 101 typedef std::vector<UpdateResponseData> UpdateResponseDataList; | 
| 102 | 102 | 
| 103 }  // namespace syncer | 103 }  // namespace syncer | 
| 104 | 104 | 
| 105 #endif  // SYNC_ENGINE_NON_BLOCKING_SYNC_COMMON_H_ | 105 #endif  // SYNC_ENGINE_NON_BLOCKING_SYNC_COMMON_H_ | 
| OLD | NEW | 
|---|