| Index: chrome/browser/prefs/pref_model_associator.h
|
| diff --git a/chrome/browser/prefs/pref_model_associator.h b/chrome/browser/prefs/pref_model_associator.h
|
| index 049b5c3a3228fcf4ae4b366aa857f22717500504..2c20f04066f6d81382db75836bbc2d6d289a46f5 100644
|
| --- a/chrome/browser/prefs/pref_model_associator.h
|
| +++ b/chrome/browser/prefs/pref_model_associator.h
|
| @@ -45,16 +45,16 @@ class PrefModelAssociator
|
|
|
| // syncer::SyncableService implementation.
|
| virtual syncer::SyncDataList GetAllSyncData(
|
| - syncer::ModelType type) const OVERRIDE;
|
| + syncer::ModelType type) const override;
|
| virtual syncer::SyncError ProcessSyncChanges(
|
| const tracked_objects::Location& from_here,
|
| - const syncer::SyncChangeList& change_list) OVERRIDE;
|
| + const syncer::SyncChangeList& change_list) override;
|
| virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
|
| syncer::ModelType type,
|
| const syncer::SyncDataList& initial_sync_data,
|
| scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| - scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE;
|
| - virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
|
| + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override;
|
| + virtual void StopSyncing(syncer::ModelType type) override;
|
|
|
| // Returns the list of preference names that are registered as syncable, and
|
| // hence should be monitored for changes.
|
|
|