| Index: sync/internal_api/public/shared_model_type_processor.h
|
| diff --git a/sync/internal_api/public/shared_model_type_processor.h b/sync/internal_api/public/shared_model_type_processor.h
|
| index f237f8cf252cd8a10432c20afb5c24dacbef4b43..a0227c93d18a836bb8231d3d2ae5df78e5274727 100644
|
| --- a/sync/internal_api/public/shared_model_type_processor.h
|
| +++ b/sync/internal_api/public/shared_model_type_processor.h
|
| @@ -20,6 +20,7 @@
|
| #include "sync/internal_api/public/base/model_type.h"
|
| #include "sync/internal_api/public/model_type_processor.h"
|
| #include "sync/internal_api/public/non_blocking_sync_common.h"
|
| +#include "sync/protocol/data_type_state.pb.h"
|
| #include "sync/protocol/sync.pb.h"
|
|
|
| namespace syncer_v2 {
|
| @@ -86,9 +87,9 @@ class SYNC_EXPORT SharedModelTypeProcessor : public ModelTypeProcessor,
|
|
|
| // ModelTypeProcessor implementation.
|
| void OnConnect(scoped_ptr<CommitQueue> worker) override;
|
| - void OnCommitCompleted(const DataTypeState& type_state,
|
| + void OnCommitCompleted(const sync_pb::DataTypeState& type_state,
|
| const CommitResponseDataList& response_list) override;
|
| - void OnUpdateReceived(const DataTypeState& type_state,
|
| + void OnUpdateReceived(const sync_pb::DataTypeState& type_state,
|
| const UpdateResponseDataList& response_list,
|
| const UpdateResponseDataList& pending_updates) override;
|
|
|
| @@ -107,7 +108,7 @@ class SYNC_EXPORT SharedModelTypeProcessor : public ModelTypeProcessor,
|
| void FinishStart(StartCallback callback);
|
|
|
| // Handle the first update received from the server after being enabled.
|
| - void OnInitialUpdateReceived(const DataTypeState& type_state,
|
| + void OnInitialUpdateReceived(const sync_pb::DataTypeState& type_state,
|
| const UpdateResponseDataList& response_list,
|
| const UpdateResponseDataList& pending_updates);
|
|
|
| @@ -124,7 +125,7 @@ class SYNC_EXPORT SharedModelTypeProcessor : public ModelTypeProcessor,
|
| void ClearSyncState();
|
|
|
| syncer::ModelType type_;
|
| - DataTypeState data_type_state_;
|
| + sync_pb::DataTypeState data_type_state_;
|
|
|
| // Whether or not sync is enabled by this type's DataTypeController.
|
| bool is_enabled_;
|
|
|