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

Unified Diff: components/sync_driver/shared_change_processor.h

Issue 1966023002: [Sync] Move DataTypeErrorHandler to //sync. (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
Index: components/sync_driver/shared_change_processor.h
diff --git a/components/sync_driver/shared_change_processor.h b/components/sync_driver/shared_change_processor.h
index 0695ff2e3ad356b27ddddcea21366048fa11cff6..89f8a94341e3da21d81f4ea5b1ae0a62c9690546 100644
--- a/components/sync_driver/shared_change_processor.h
+++ b/components/sync_driver/shared_change_processor.h
@@ -13,15 +13,16 @@
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
#include "base/synchronization/lock.h"
-#include "components/sync_driver/data_type_error_handler.h"
#include "sync/api/sync_change_processor.h"
#include "sync/api/sync_data.h"
#include "sync/api/sync_error.h"
#include "sync/api/sync_error_factory.h"
#include "sync/api/sync_merge_result.h"
+#include "sync/internal_api/public/data_type_error_handler.h"
#include "sync/internal_api/public/engine/model_safe_worker.h"
namespace syncer {
+class DataTypeErrorHandler;
pavely 2016/05/11 18:29:04 Could you remove either include or forward-declare
maxbogue 2016/05/11 19:03:02 Done.
class SyncableService;
struct UserShare;
} // namespace syncer
@@ -31,7 +32,6 @@ namespace sync_driver {
class ChangeProcessor;
class GenericChangeProcessor;
class GenericChangeProcessorFactory;
-class DataTypeErrorHandler;
class SyncClient;
// A ref-counted wrapper around a GenericChangeProcessor for use with datatypes
@@ -66,7 +66,7 @@ class SharedChangeProcessor
SyncClient* sync_client,
GenericChangeProcessorFactory* processor_factory,
syncer::UserShare* user_share,
- DataTypeErrorHandler* error_handler,
+ syncer::DataTypeErrorHandler* error_handler,
syncer::ModelType type,
const base::WeakPtr<syncer::SyncMergeResult>& merge_result);
@@ -135,7 +135,7 @@ class SharedChangeProcessor
// Used only on |backend_loop_|.
GenericChangeProcessor* generic_change_processor_;
- DataTypeErrorHandler* error_handler_;
+ syncer::DataTypeErrorHandler* error_handler_;
DISALLOW_COPY_AND_ASSIGN(SharedChangeProcessor);
};

Powered by Google App Engine
This is Rietveld 408576698