Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2510)

Unified Diff: chrome/browser/sync/engine/resolve_conflicts_command.h

Issue 8470005: Add OVERRIDE to chrome/browser/sync/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: includes Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
« no previous file with comments | « chrome/browser/sync/engine/process_updates_command.h ('k') | chrome/browser/sync/engine/store_timestamps_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698