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 ef5ab08222eec6865a6a872278d6c279bb570273..b44f1b82bf36a3d420880ed086ac85b8534d284a 100644 |
--- a/sync/engine/process_commit_response_command.h |
+++ b/sync/engine/process_commit_response_command.h |
@@ -12,7 +12,7 @@ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "sync/engine/model_changing_syncer_command.h" |
-#include "sync/engine/syncproto.h" |
+#include "sync/protocol/sync.pb.h" |
namespace syncer { |
@@ -53,8 +53,8 @@ class ProcessCommitResponseCommand : public ModelChangingSyncerCommand { |
// or a serious error was encountered. |
ProcessCommitResponseCommand( |
const sessions::OrderedCommitSet& commit_set, |
- const ClientToServerMessage& commit_message, |
- const ClientToServerResponse& commit_response); |
+ const sync_pb::ClientToServerMessage& commit_message, |
+ const sync_pb::ClientToServerResponse& commit_response); |
virtual ~ProcessCommitResponseCommand(); |
protected: |
@@ -65,7 +65,7 @@ class ProcessCommitResponseCommand : public ModelChangingSyncerCommand { |
sessions::SyncSession* session) OVERRIDE; |
private: |
- CommitResponse::ResponseType ProcessSingleCommitResponse( |
+ sync_pb::CommitResponse::ResponseType ProcessSingleCommitResponse( |
syncable::WriteTransaction* trans, |
const sync_pb::CommitResponse_EntryResponse& pb_commit_response, |
const sync_pb::SyncEntity& pb_committed_entry, |
@@ -77,7 +77,7 @@ class ProcessCommitResponseCommand : public ModelChangingSyncerCommand { |
void ProcessSuccessfulCommitResponse( |
const sync_pb::SyncEntity& committed_entry, |
- const CommitResponse_EntryResponse& entry_response, |
+ const sync_pb::CommitResponse_EntryResponse& entry_response, |
const syncable::Id& pre_commit_id, syncable::MutableEntry* local_entry, |
bool syncing_was_set, std::set<syncable::Id>* deleted_folders); |
@@ -85,14 +85,14 @@ class ProcessCommitResponseCommand : public ModelChangingSyncerCommand { |
// Helper for ProcessSuccessfulCommitResponse. |
bool UpdateVersionAfterCommit( |
const sync_pb::SyncEntity& committed_entry, |
- const CommitResponse_EntryResponse& entry_response, |
+ const sync_pb::CommitResponse_EntryResponse& entry_response, |
const syncable::Id& pre_commit_id, |
syncable::MutableEntry* local_entry); |
// If the server generated an ID for us during a commit, apply the new ID. |
// Helper for ProcessSuccessfulCommitResponse. |
bool ChangeIdAfterCommit( |
- const CommitResponse_EntryResponse& entry_response, |
+ const sync_pb::CommitResponse_EntryResponse& entry_response, |
const syncable::Id& pre_commit_id, |
syncable::MutableEntry* local_entry); |
@@ -100,7 +100,7 @@ class ProcessCommitResponseCommand : public ModelChangingSyncerCommand { |
// Helper for ProcessSuccessfulCommitResponse. |
void UpdateServerFieldsAfterCommit( |
const sync_pb::SyncEntity& committed_entry, |
- const CommitResponse_EntryResponse& entry_response, |
+ const sync_pb::CommitResponse_EntryResponse& entry_response, |
syncable::MutableEntry* local_entry); |
// The server can override some values during a commit; the overridden values |
@@ -111,13 +111,13 @@ class ProcessCommitResponseCommand : public ModelChangingSyncerCommand { |
// Helper for ProcessSuccessfulCommitResponse. |
void OverrideClientFieldsAfterCommit( |
const sync_pb::SyncEntity& committed_entry, |
- const CommitResponse_EntryResponse& entry_response, |
+ const sync_pb::CommitResponse_EntryResponse& entry_response, |
syncable::MutableEntry* local_entry); |
// Helper to extract the final name from the protobufs. |
const std::string& GetResultingPostCommitName( |
const sync_pb::SyncEntity& committed_entry, |
- const CommitResponse_EntryResponse& entry_response); |
+ const sync_pb::CommitResponse_EntryResponse& entry_response); |
// Helper to clean up in case of failure. |
void ClearSyncingBits( |
@@ -125,8 +125,8 @@ class ProcessCommitResponseCommand : public ModelChangingSyncerCommand { |
const std::vector<syncable::Id>& commit_ids); |
const sessions::OrderedCommitSet& commit_set_; |
- const ClientToServerMessage& commit_message_; |
- const ClientToServerResponse& commit_response_; |
+ const sync_pb::ClientToServerMessage& commit_message_; |
+ const sync_pb::ClientToServerResponse& commit_response_; |
DISALLOW_COPY_AND_ASSIGN(ProcessCommitResponseCommand); |
}; |