| Index: components/sync/api/model_type_change_processor.h
|
| diff --git a/components/sync/api/model_type_change_processor.h b/components/sync/api/model_type_change_processor.h
|
| index 3b7df93ac1a65df31dd46fee57191e78a8388f56..4cd7e321ed65c63268cea0f340751fcce454d491 100644
|
| --- a/components/sync/api/model_type_change_processor.h
|
| +++ b/components/sync/api/model_type_change_processor.h
|
| @@ -17,17 +17,16 @@ namespace syncer {
|
| class SyncError;
|
| } // namespace syncer
|
|
|
| -namespace syncer_v2 {
|
| +namespace syncer {
|
|
|
| class MetadataBatch;
|
| class MetadataChangeList;
|
|
|
| // Interface used by the ModelTypeService to inform sync of local
|
| // changes.
|
| -class ModelTypeChangeProcessor : public syncer::SyncErrorFactory {
|
| +class ModelTypeChangeProcessor : public SyncErrorFactory {
|
| public:
|
| - typedef base::Callback<void(syncer::SyncError,
|
| - std::unique_ptr<ActivationContext>)>
|
| + typedef base::Callback<void(SyncError, std::unique_ptr<ActivationContext>)>
|
| StartCallback;
|
|
|
| ModelTypeChangeProcessor();
|
| @@ -47,7 +46,7 @@ class ModelTypeChangeProcessor : public syncer::SyncErrorFactory {
|
|
|
| // Accept the initial sync metadata loaded by the service. This should be
|
| // called as soon as the metadata is available to the service.
|
| - virtual void OnMetadataLoaded(syncer::SyncError error,
|
| + virtual void OnMetadataLoaded(SyncError error,
|
| std::unique_ptr<MetadataBatch> batch) = 0;
|
|
|
| // Indicates that sync wants to connect a sync worker to this processor. Once
|
| @@ -57,7 +56,7 @@ class ModelTypeChangeProcessor : public syncer::SyncErrorFactory {
|
| // guaranteed to outlive the processor. StartCallback takes a SyncError and an
|
| // ActivationContext; the context should be nullptr iff the error is set.
|
| virtual void OnSyncStarting(
|
| - std::unique_ptr<syncer::DataTypeErrorHandler> error_handler,
|
| + std::unique_ptr<DataTypeErrorHandler> error_handler,
|
| const StartCallback& callback) = 0;
|
|
|
| // Indicates that sync is being disabled permanently for this data type. All
|
| @@ -65,6 +64,6 @@ class ModelTypeChangeProcessor : public syncer::SyncErrorFactory {
|
| virtual void DisableSync() = 0;
|
| };
|
|
|
| -} // namespace syncer_v2
|
| +} // namespace syncer
|
|
|
| #endif // COMPONENTS_SYNC_API_MODEL_TYPE_CHANGE_PROCESSOR_H_
|
|
|