| Index: components/sync/driver/change_processor.h
|
| diff --git a/components/sync/driver/change_processor.h b/components/sync/driver/change_processor.h
|
| index b80fa0bbb65f6aac7ccf14d7bd2fc1776157b175..2990bacea7dc710f6aa925b333071cf4d0a175f8 100644
|
| --- a/components/sync/driver/change_processor.h
|
| +++ b/components/sync/driver/change_processor.h
|
| @@ -16,19 +16,15 @@
|
| #include "components/sync/core/user_share.h"
|
|
|
| namespace syncer {
|
| -class UnrecoverableErrorHandler;
|
| -} // namespace syncer
|
| -
|
| -namespace sync_driver {
|
|
|
| class ModelAssociator;
|
| +class UnrecoverableErrorHandler;
|
|
|
| // An interface used to apply changes from the sync model to the browser's
|
| // native model. This does not currently distinguish between model data types.
|
| class ChangeProcessor {
|
| public:
|
| - explicit ChangeProcessor(
|
| - std::unique_ptr<syncer::DataTypeErrorHandler> error_handler);
|
| + explicit ChangeProcessor(std::unique_ptr<DataTypeErrorHandler> error_handler);
|
| virtual ~ChangeProcessor();
|
|
|
| // Call when the processor should accept changes from either provided model
|
| @@ -36,14 +32,14 @@ class ChangeProcessor {
|
| // expected to be initialized and loaded. You must have set a valid
|
| // ModelAssociator and UnrecoverableErrorHandler before using this method, and
|
| // the two models should be associated w.r.t the ModelAssociator provided.
|
| - void Start(syncer::UserShare* share_handle);
|
| + void Start(UserShare* share_handle);
|
|
|
| // Changes have been applied to the backend model and are ready to be
|
| // applied to the frontend model.
|
| virtual void ApplyChangesFromSyncModel(
|
| - const syncer::BaseTransaction* trans,
|
| + const BaseTransaction* trans,
|
| int64_t model_version,
|
| - const syncer::ImmutableChangeRecordList& changes) = 0;
|
| + const ImmutableChangeRecordList& changes) = 0;
|
|
|
| // The changes found in ApplyChangesFromSyncModel may be too slow to be
|
| // performed while holding a [Read/Write]Transaction lock or may interact
|
| @@ -59,18 +55,18 @@ class ChangeProcessor {
|
| // implementation-specific work.
|
| virtual void StartImpl() = 0;
|
|
|
| - syncer::DataTypeErrorHandler* error_handler() const;
|
| - virtual syncer::UserShare* share_handle() const;
|
| + DataTypeErrorHandler* error_handler() const;
|
| + virtual UserShare* share_handle() const;
|
|
|
| private:
|
| - std::unique_ptr<syncer::DataTypeErrorHandler> error_handler_;
|
| + std::unique_ptr<DataTypeErrorHandler> error_handler_;
|
|
|
| // The sync model we are processing changes from.
|
| - syncer::UserShare* share_handle_;
|
| + UserShare* share_handle_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChangeProcessor);
|
| };
|
|
|
| -} // namespace sync_driver
|
| +} // namespace syncer
|
|
|
| #endif // COMPONENTS_SYNC_DRIVER_CHANGE_PROCESSOR_H_
|
|
|