| Index: sync/engine/process_commit_response_command.h
|
| diff --git a/sync/engine/process_commit_response_command.h b/sync/engine/process_commit_response_command.h
|
| index 8e288de853e29009ff800dda0bf978b084ed1b50..6a12d73c2246b4ae21e77c4ac5263b94a91ced57 100644
|
| --- a/sync/engine/process_commit_response_command.h
|
| +++ b/sync/engine/process_commit_response_command.h
|
| @@ -18,14 +18,22 @@ namespace syncable {
|
| class Id;
|
| class WriteTransaction;
|
| class MutableEntry;
|
| +class Directory;
|
| }
|
|
|
| namespace browser_sync {
|
|
|
| +namespace sessions {
|
| +class OrderedCommitSet;
|
| +}
|
| +
|
| class ProcessCommitResponseCommand : public ModelChangingSyncerCommand {
|
| public:
|
|
|
| - ProcessCommitResponseCommand();
|
| + ProcessCommitResponseCommand(
|
| + const sessions::OrderedCommitSet& commit_set,
|
| + const ClientToServerMessage& commit_message,
|
| + const ClientToServerResponse& commit_response);
|
| virtual ~ProcessCommitResponseCommand();
|
|
|
| protected:
|
| @@ -43,7 +51,6 @@ class ProcessCommitResponseCommand : public ModelChangingSyncerCommand {
|
| const sync_pb::CommitResponse_EntryResponse& pb_commit_response,
|
| const sync_pb::SyncEntity& pb_committed_entry,
|
| const syncable::Id& pre_commit_id,
|
| - std::set<syncable::Id>* conflicting_new_directory_ids,
|
| std::set<syncable::Id>* deleted_folders);
|
|
|
| // Actually does the work of execute.
|
| @@ -93,6 +100,15 @@ class ProcessCommitResponseCommand : public ModelChangingSyncerCommand {
|
| const sync_pb::SyncEntity& committed_entry,
|
| const CommitResponse_EntryResponse& entry_response);
|
|
|
| + // Helper to clean up in case of failure.
|
| + void ClearSyncingBits(
|
| + syncable::Directory *dir,
|
| + const std::vector<syncable::Id>& commit_ids);
|
| +
|
| + const sessions::OrderedCommitSet& commit_set_;
|
| + const ClientToServerMessage& commit_message_;
|
| + const ClientToServerResponse& commit_response_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ProcessCommitResponseCommand);
|
| };
|
|
|
|
|