| Index: chrome/browser/sync/engine/resolve_conflicts_command.h
|
| ===================================================================
|
| --- chrome/browser/sync/engine/resolve_conflicts_command.h (revision 32731)
|
| +++ chrome/browser/sync/engine/resolve_conflicts_command.h (working copy)
|
| @@ -16,14 +16,13 @@
|
|
|
| namespace browser_sync {
|
|
|
| -class SyncerSession;
|
| -
|
| class ResolveConflictsCommand : public ModelChangingSyncerCommand {
|
| public:
|
| ResolveConflictsCommand();
|
| virtual ~ResolveConflictsCommand();
|
|
|
| - virtual void ModelChangingExecuteImpl(SyncerSession* session);
|
| + // ModelChangingSyncerCommand implementation.
|
| + virtual void ModelChangingExecuteImpl(sessions::SyncSession* session);
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);
|
|
|