| Index: chrome/browser/sync/engine/resolve_conflicts_command.h
|
| diff --git a/chrome/browser/sync/engine/resolve_conflicts_command.h b/chrome/browser/sync/engine/resolve_conflicts_command.h
|
| index 4312f285392ba21090a4b840beca1d64dad03b6c..1fcdec932f055a7c00394d22d147aa95237d7860 100644
|
| --- a/chrome/browser/sync/engine/resolve_conflicts_command.h
|
| +++ b/chrome/browser/sync/engine/resolve_conflicts_command.h
|
| @@ -7,6 +7,7 @@
|
| #pragma once
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/compiler_specific.h"
|
| #include "chrome/browser/sync/engine/model_changing_syncer_command.h"
|
|
|
| namespace browser_sync {
|
| @@ -17,7 +18,8 @@ class ResolveConflictsCommand : public ModelChangingSyncerCommand {
|
| virtual ~ResolveConflictsCommand();
|
|
|
| // ModelChangingSyncerCommand implementation.
|
| - virtual void ModelChangingExecuteImpl(sessions::SyncSession* session);
|
| + virtual void ModelChangingExecuteImpl(
|
| + sessions::SyncSession* session) OVERRIDE;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);
|
|
|