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 2bbb1892698a5fb599088aa7710b55a35e0a046d..2c9d4e2727f9a06efd33434ff9b3eb16d14c7343 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h |
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h |
@@ -41,8 +41,8 @@ class ConflictResolver : public SyncTask { |
typedef std::vector<std::string> FileIDList; |
explicit ConflictResolver(SyncEngineContext* sync_context); |
- virtual ~ConflictResolver(); |
- virtual void RunPreflight(scoped_ptr<SyncTaskToken> token) override; |
+ ~ConflictResolver() override; |
+ void RunPreflight(scoped_ptr<SyncTaskToken> token) override; |
void RunExclusive(scoped_ptr<SyncTaskToken> token); |
private: |