| Index: chrome/browser/themes/theme_syncable_service.h
|
| diff --git a/chrome/browser/themes/theme_syncable_service.h b/chrome/browser/themes/theme_syncable_service.h
|
| index df30bc5f262299ad8551abece0a1a13cbc6414c5..c5bd8938979c99bf51a1be3ca4b16e0886ccd9df 100644
|
| --- a/chrome/browser/themes/theme_syncable_service.h
|
| +++ b/chrome/browser/themes/theme_syncable_service.h
|
| @@ -25,7 +25,7 @@ class ThemeSyncableService : public syncer::SyncableService {
|
| public:
|
| ThemeSyncableService(Profile* profile, // Same profile used by theme_service.
|
| ThemeService* theme_service);
|
| - virtual ~ThemeSyncableService();
|
| + ~ThemeSyncableService() override;
|
|
|
| static syncer::ModelType model_type() { return syncer::THEMES; }
|
|
|
| @@ -33,15 +33,14 @@ class ThemeSyncableService : public syncer::SyncableService {
|
| void OnThemeChange();
|
|
|
| // syncer::SyncableService implementation.
|
| - 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> 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;
|
|
|
|
|