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

Unified Diff: chrome/browser/sync/glue/typed_url_model_associator.h

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
Index: chrome/browser/sync/glue/typed_url_model_associator.h
diff --git a/chrome/browser/sync/glue/typed_url_model_associator.h b/chrome/browser/sync/glue/typed_url_model_associator.h
index 9357940318f3171fcd2246308953c54db34f11ba..4fbc318d506d2d72cd4b69c2c6feac46fff8d156 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator.h
+++ b/chrome/browser/sync/glue/typed_url_model_associator.h
@@ -58,20 +58,20 @@ class TypedUrlModelAssociator : public sync_driver::AssociatorInterface {
// Iterates through the sync model looking for matched pairs of items.
virtual syncer::SyncError AssociateModels(
syncer::SyncMergeResult* local_merge_result,
- syncer::SyncMergeResult* syncer_merge_result) OVERRIDE;
+ syncer::SyncMergeResult* syncer_merge_result) override;
// Clears all associations.
- virtual syncer::SyncError DisassociateModels() OVERRIDE;
+ virtual syncer::SyncError DisassociateModels() override;
// Called from the main thread, to abort the currently active model
// association (for example, if we are shutting down).
- virtual void AbortAssociation() OVERRIDE;
+ virtual void AbortAssociation() override;
// The has_nodes out param is true if the sync model has nodes other
// than the permanent tagged nodes.
- virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes) OVERRIDE;
+ virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes) override;
- virtual bool CryptoReadyIfNecessary() OVERRIDE;
+ virtual bool CryptoReadyIfNecessary() override;
// Delete all typed url nodes.
bool DeleteAllNodes(syncer::WriteTransaction* trans);
« no previous file with comments | « chrome/browser/sync/glue/typed_url_data_type_controller.cc ('k') | chrome/browser/sync/glue/ui_model_worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698