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

Unified Diff: sync/sessions/model_type_registry.h

Issue 629733002: replace OVERRIDE and FINAL with override and final in sync/ (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 | « sync/js/sync_js_controller.h ('k') | sync/sessions/model_type_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/model_type_registry.h
diff --git a/sync/sessions/model_type_registry.h b/sync/sessions/model_type_registry.h
index 0b4a5b46b4b7509ac500306746d68476f74f62f1..c44a3b732d3f337ec57ad679866c758708fa3a0e 100644
--- a/sync/sessions/model_type_registry.h
+++ b/sync/sessions/model_type_registry.h
@@ -62,28 +62,28 @@ class SYNC_EXPORT_PRIVATE ModelTypeRegistry
const DataTypeState& data_type_state,
const syncer::UpdateResponseDataList& saved_pending_updates,
const scoped_refptr<base::SequencedTaskRunner>& type_task_runner,
- const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy) OVERRIDE;
+ const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy) override;
// Disables the syncing of an off-thread type.
//
// Expects that the type is currently enabled.
// Deletes the worker associated with the type.
- virtual void DisconnectSyncWorker(syncer::ModelType type) OVERRIDE;
+ virtual void DisconnectSyncWorker(syncer::ModelType type) override;
// Implementation of SyncEncryptionHandler::Observer.
virtual void OnPassphraseRequired(
PassphraseRequiredReason reason,
- const sync_pb::EncryptedData& pending_keys) OVERRIDE;
- virtual void OnPassphraseAccepted() OVERRIDE;
+ const sync_pb::EncryptedData& pending_keys) override;
+ virtual void OnPassphraseAccepted() override;
virtual void OnBootstrapTokenUpdated(const std::string& bootstrap_token,
- BootstrapTokenType type) OVERRIDE;
+ BootstrapTokenType type) override;
virtual void OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
- bool encrypt_everything) OVERRIDE;
- virtual void OnEncryptionComplete() OVERRIDE;
+ bool encrypt_everything) override;
+ virtual void OnEncryptionComplete() override;
virtual void OnCryptographerStateChanged(
- Cryptographer* cryptographer) OVERRIDE;
+ Cryptographer* cryptographer) override;
virtual void OnPassphraseTypeChanged(PassphraseType type,
- base::Time passphrase_time) OVERRIDE;
+ base::Time passphrase_time) override;
// Gets the set of enabled types.
ModelTypeSet GetEnabledTypes() const;
« no previous file with comments | « sync/js/sync_js_controller.h ('k') | sync/sessions/model_type_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698