| Index: chrome/browser/sync/engine/process_commit_response_command.h
|
| ===================================================================
|
| --- chrome/browser/sync/engine/process_commit_response_command.h (revision 32731)
|
| +++ chrome/browser/sync/engine/process_commit_response_command.h (working copy)
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "chrome/browser/sync/engine/model_changing_syncer_command.h"
|
| -#include "chrome/browser/sync/engine/syncer_session.h"
|
| #include "chrome/browser/sync/engine/syncproto.h"
|
|
|
| namespace syncable {
|
| @@ -23,37 +22,33 @@
|
| class ProcessCommitResponseCommand : public ModelChangingSyncerCommand {
|
| public:
|
|
|
| - explicit ProcessCommitResponseCommand(ExtensionsActivityMonitor* monitor);
|
| + ProcessCommitResponseCommand();
|
| virtual ~ProcessCommitResponseCommand();
|
|
|
| - virtual void ModelChangingExecuteImpl(SyncerSession* session);
|
| + // ModelChangingSyncerCommand implementation.
|
| + virtual void ModelChangingExecuteImpl(sessions::SyncSession* session);
|
| +
|
| private:
|
| CommitResponse::RESPONSE_TYPE ProcessSingleCommitResponse(
|
| syncable::WriteTransaction* trans,
|
| const sync_pb::CommitResponse_EntryResponse& pb_server_entry,
|
| const syncable::Id& pre_commit_id, std::set<syncable::Id>*
|
| conflicting_new_directory_ids,
|
| - std::set<syncable::Id>* deleted_folders,
|
| - SyncerSession* const session);
|
| + std::set<syncable::Id>* deleted_folders);
|
|
|
| // Actually does the work of execute.
|
| - void ProcessCommitResponse(SyncerSession* session);
|
| + void ProcessCommitResponse(sessions::SyncSession* session);
|
|
|
| void ProcessSuccessfulCommitResponse(syncable::WriteTransaction* trans,
|
| const CommitResponse_EntryResponse& server_entry,
|
| const syncable::Id& pre_commit_id, syncable::MutableEntry* local_entry,
|
| - bool syncing_was_set, std::set<syncable::Id>* deleted_folders,
|
| - SyncerSession* const session);
|
| + bool syncing_was_set, std::set<syncable::Id>* deleted_folders);
|
|
|
| void PerformCommitTimeNameAside(
|
| syncable::WriteTransaction* trans,
|
| const CommitResponse_EntryResponse& server_entry,
|
| syncable::MutableEntry* local_entry);
|
|
|
| - // We may need to update this with records from a commit attempt if the
|
| - // attempt failed.
|
| - ExtensionsActivityMonitor* extensions_monitor_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ProcessCommitResponseCommand);
|
| };
|
|
|
|
|