Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.h |
diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h |
index 1fb04ee2098e8ce43769dc2ae72f64feee9bd10d..a446e7e63cf257f10f1489e4d00e5fb0284bf5cf 100644 |
--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h |
+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h |
@@ -9,6 +9,7 @@ |
#include <vector> |
#include "base/basictypes.h" |
+#include "base/compiler_specific.h" |
#include "chrome/browser/sync/engine/model_changing_syncer_command.h" |
#include "chrome/browser/sync/engine/model_safe_worker.h" |
@@ -35,7 +36,8 @@ class BuildAndProcessConflictSetsCommand : public ModelChangingSyncerCommand { |
virtual ~BuildAndProcessConflictSetsCommand(); |
// ModelChangingSyncerCommand implementation. |
- virtual void ModelChangingExecuteImpl(sessions::SyncSession* session); |
+ virtual void ModelChangingExecuteImpl( |
+ sessions::SyncSession* session) OVERRIDE; |
private: |
bool BuildAndProcessConflictSets(sessions::SyncSession* session); |