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 4fbc318d506d2d72cd4b69c2c6feac46fff8d156..44e9ea7be8c7d0165b6b791a8e2c7340a69f0928 100644 |
--- a/chrome/browser/sync/glue/typed_url_model_associator.h |
+++ b/chrome/browser/sync/glue/typed_url_model_associator.h |
@@ -51,27 +51,27 @@ class TypedUrlModelAssociator : public sync_driver::AssociatorInterface { |
TypedUrlModelAssociator(ProfileSyncService* sync_service, |
history::HistoryBackend* history_backend, |
sync_driver::DataTypeErrorHandler* error_handler); |
- virtual ~TypedUrlModelAssociator(); |
+ ~TypedUrlModelAssociator() override; |
// AssociatorInterface implementation. |
// |
// Iterates through the sync model looking for matched pairs of items. |
- virtual syncer::SyncError AssociateModels( |
+ syncer::SyncError AssociateModels( |
syncer::SyncMergeResult* local_merge_result, |
syncer::SyncMergeResult* syncer_merge_result) override; |
// Clears all associations. |
- virtual syncer::SyncError DisassociateModels() override; |
+ 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; |
+ 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; |
+ bool SyncModelHasUserCreatedNodes(bool* has_nodes) override; |
- virtual bool CryptoReadyIfNecessary() override; |
+ bool CryptoReadyIfNecessary() override; |
// Delete all typed url nodes. |
bool DeleteAllNodes(syncer::WriteTransaction* trans); |