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

Unified Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver.h

Issue 666143002: Standardize usage of virtual/override/final in chrome/browser/sync_file_system/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698