Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver.h |
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h |
index e18a869d76c853cbed18696b52a6e86708a14839..2bbb1892698a5fb599088aa7710b55a35e0a046d 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h |
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h |
@@ -42,7 +42,7 @@ class ConflictResolver : public SyncTask { |
explicit ConflictResolver(SyncEngineContext* sync_context); |
virtual ~ConflictResolver(); |
- virtual void RunPreflight(scoped_ptr<SyncTaskToken> token) OVERRIDE; |
+ virtual void RunPreflight(scoped_ptr<SyncTaskToken> token) override; |
void RunExclusive(scoped_ptr<SyncTaskToken> token); |
private: |