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

Unified Diff: components/sync/driver/model_type_controller.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/driver/model_type_controller.h
diff --git a/components/sync/driver/model_type_controller.h b/components/sync/driver/model_type_controller.h
index caf30216ef7bb664c1e646031e2ac6021d492572..92152d7a95a558208a87074d8422c6c93d9269f3 100644
--- a/components/sync/driver/model_type_controller.h
+++ b/components/sync/driver/model_type_controller.h
@@ -14,6 +14,8 @@
#include "components/sync/base/model_type.h"
#include "components/sync/base/sync_prefs.h"
#include "components/sync/driver/data_type_controller.h"
+#include "components/sync/model/model_error.h"
+#include "components/sync/model/sync_error.h"
namespace syncer {
@@ -45,12 +47,9 @@ class ModelTypeController : public DataTypeController {
std::string name() const override;
State state() const override;
- protected:
- std::unique_ptr<DataTypeErrorHandler> CreateErrorHandler() override;
-
private:
void RecordStartFailure(ConfigureResult result) const;
- void ReportLoadModelError(const SyncError& error);
+ void ReportModelError(const ModelError& error);
// If the DataType controller is waiting for models to load, once the models
// are loaded this function should be called to let the base class
@@ -61,7 +60,6 @@ class ModelTypeController : public DataTypeController {
// The function will do the real work when OnProcessorStarted got called. This
// is called on the UI thread.
void OnProcessorStarted(
- SyncError error,
std::unique_ptr<ActivationContext> activation_context);
// The sync client, which provides access to this type's ModelTypeSyncBridge.
« no previous file with comments | « components/sync/driver/directory_data_type_controller.h ('k') | components/sync/driver/model_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698