| Index: chrome/browser/spellchecker/spellcheck_custom_dictionary.h
|
| diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
|
| index ac2eaad91edf7393a5df227359dc55e4bcf04c0d..b8b329e765e543a5b17e72eb897081b1bf0ebcd9 100644
|
| --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
|
| +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
|
| @@ -75,7 +75,7 @@ class SpellcheckCustomDictionary : public SpellcheckDictionary,
|
| };
|
|
|
| explicit SpellcheckCustomDictionary(const base::FilePath& path);
|
| - virtual ~SpellcheckCustomDictionary();
|
| + ~SpellcheckCustomDictionary() override;
|
|
|
| // Returns the in-memory cache of words in the custom dictionary.
|
| const chrome::spellcheck_common::WordSet& GetWords() const;
|
| @@ -106,18 +106,17 @@ class SpellcheckCustomDictionary : public SpellcheckDictionary,
|
| bool IsSyncing();
|
|
|
| // Overridden from SpellcheckDictionary:
|
| - virtual void Load() override;
|
| + void Load() override;
|
|
|
| // Overridden from syncer::SyncableService:
|
| - virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
|
| + syncer::SyncMergeResult MergeDataAndStartSyncing(
|
| syncer::ModelType type,
|
| const syncer::SyncDataList& initial_sync_data,
|
| scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| scoped_ptr<syncer::SyncErrorFactory> sync_error_handler) override;
|
| - virtual void StopSyncing(syncer::ModelType type) override;
|
| - virtual syncer::SyncDataList GetAllSyncData(
|
| - syncer::ModelType type) const override;
|
| - virtual syncer::SyncError ProcessSyncChanges(
|
| + void StopSyncing(syncer::ModelType type) override;
|
| + syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
|
| + syncer::SyncError ProcessSyncChanges(
|
| const tracked_objects::Location& from_here,
|
| const syncer::SyncChangeList& change_list) override;
|
|
|
|
|