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

Unified Diff: components/sync/model/model_type_sync_bridge.h

Issue 2620773002: [Sync] Use ModelError all the way through to ModelTypeController. (Closed)
Patch Set: const& everything and use a typedef. Created 3 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 side-by-side diff with in-line comments
Download patch
Index: components/sync/model/model_type_sync_bridge.h
diff --git a/components/sync/model/model_type_sync_bridge.h b/components/sync/model/model_type_sync_bridge.h
index fb597e6a51a1bf0986889068850350656fdee000..693e85b150728e265abf2cdbd9fe8cb9960968d9 100644
--- a/components/sync/model/model_type_sync_bridge.h
+++ b/components/sync/model/model_type_sync_bridge.h
@@ -13,7 +13,6 @@
#include "base/memory/weak_ptr.h"
#include "components/sync/engine/activation_context.h"
#include "components/sync/model/conflict_resolution.h"
-#include "components/sync/model/data_type_error_handler.h"
#include "components/sync/model/entity_change.h"
#include "components/sync/model/entity_data.h"
#include "components/sync/model/model_error.h"
@@ -113,7 +112,7 @@ class ModelTypeSyncBridge : public base::SupportsWeakPtr<ModelTypeSyncBridge> {
// Called by the DataTypeController to gather additional information needed
// before the processor can be connected to a sync worker. Once the
// metadata has been loaded, the info is collected and given to |callback|.
- void OnSyncStarting(std::unique_ptr<DataTypeErrorHandler> error_handler,
+ void OnSyncStarting(const ModelErrorHandler& error_handler,
const ModelTypeChangeProcessor::StartCallback& callback);
// Indicates that we no longer want to do any sync-related things for this
« no previous file with comments | « components/sync/model/model_type_change_processor.h ('k') | components/sync/model/model_type_sync_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698