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

Unified Diff: components/sync/driver/generic_change_processor_factory.h

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 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/generic_change_processor_factory.h
diff --git a/components/sync/driver/generic_change_processor_factory.h b/components/sync/driver/generic_change_processor_factory.h
index bc91e1be571aaa6ce3807e4dde0be30e12c06129..c071c5811703816a2eba573639f2a4ea8d107339 100644
--- a/components/sync/driver/generic_change_processor_factory.h
+++ b/components/sync/driver/generic_change_processor_factory.h
@@ -13,13 +13,16 @@
#include "components/sync/base/model_type.h"
namespace syncer {
-
class AttachmentService;
-class GenericChangeProcessor;
-class SyncClient;
-class SyncMergeResult;
class SyncableService;
+class SyncMergeResult;
struct UserShare;
+}
+
+namespace sync_driver {
+
+class GenericChangeProcessor;
+class SyncClient;
// Because GenericChangeProcessors are created and used only from the model
// thread, their lifetime is strictly shorter than other components like
@@ -35,17 +38,17 @@ class GenericChangeProcessorFactory {
GenericChangeProcessorFactory();
virtual ~GenericChangeProcessorFactory();
virtual std::unique_ptr<GenericChangeProcessor> CreateGenericChangeProcessor(
- ModelType type,
- UserShare* user_share,
- std::unique_ptr<DataTypeErrorHandler> error_handler,
- const base::WeakPtr<SyncableService>& local_service,
- const base::WeakPtr<SyncMergeResult>& merge_result,
+ syncer::ModelType type,
+ syncer::UserShare* user_share,
+ std::unique_ptr<syncer::DataTypeErrorHandler> error_handler,
+ const base::WeakPtr<syncer::SyncableService>& local_service,
+ const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
SyncClient* sync_client);
private:
DISALLOW_COPY_AND_ASSIGN(GenericChangeProcessorFactory);
};
-} // namespace syncer
+} // namespace sync_driver
#endif // COMPONENTS_SYNC_DRIVER_GENERIC_CHANGE_PROCESSOR_FACTORY_H_
« no previous file with comments | « components/sync/driver/generic_change_processor.cc ('k') | components/sync/driver/generic_change_processor_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698