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

Unified Diff: sync/internal_api/public/shared_model_type_processor.h

Issue 1991023002: [Sync] USS: Fix race condition in DeviceInfoService + add error handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/api/model_type_change_processor.h ('k') | sync/internal_api/shared_model_type_processor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/shared_model_type_processor.h
diff --git a/sync/internal_api/public/shared_model_type_processor.h b/sync/internal_api/public/shared_model_type_processor.h
index 8655d4aa7911c080e047c739073e92f058a2b68a..50b36b1c2fe5133726df41933c515581033f5d1b 100644
--- a/sync/internal_api/public/shared_model_type_processor.h
+++ b/sync/internal_api/public/shared_model_type_processor.h
@@ -63,6 +63,9 @@ class SYNC_EXPORT SharedModelTypeProcessor : public ModelTypeProcessor,
void OnSyncStarting(syncer::DataTypeErrorHandler* error_handler,
const StartCallback& callback) override;
void DisableSync() override;
+ syncer::SyncError CreateAndUploadError(
+ const tracked_objects::Location& location,
+ const std::string& message) override;
// ModelTypeProcessor implementation.
void ConnectSync(std::unique_ptr<CommitQueue> worker) override;
@@ -132,7 +135,7 @@ class SYNC_EXPORT SharedModelTypeProcessor : public ModelTypeProcessor,
// Version of the above that generates a tag for |data|.
ProcessorEntityTracker* CreateEntity(const EntityData& data);
- syncer::ModelType type_;
+ const syncer::ModelType type_;
sync_pb::DataTypeState data_type_state_;
// Stores the start callback in between OnSyncStarting() and ReadyToConnect().
« no previous file with comments | « sync/api/model_type_change_processor.h ('k') | sync/internal_api/shared_model_type_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698