| Index: chrome/browser/history/typed_url_syncable_service.h
|
| diff --git a/chrome/browser/history/typed_url_syncable_service.h b/chrome/browser/history/typed_url_syncable_service.h
|
| index d342c20ce6d454fc19e3db3f9bc786e3fd2b04ad..a0303a9ed8dca6e33aa56c0abf6de2177aa49d14 100644
|
| --- a/chrome/browser/history/typed_url_syncable_service.h
|
| +++ b/chrome/browser/history/typed_url_syncable_service.h
|
| @@ -38,20 +38,19 @@ extern const char kTypedUrlTag[];
|
| class TypedUrlSyncableService : public syncer::SyncableService {
|
| public:
|
| explicit TypedUrlSyncableService(HistoryBackend* history_backend);
|
| - virtual ~TypedUrlSyncableService();
|
| + ~TypedUrlSyncableService() override;
|
|
|
| static syncer::ModelType model_type() { return syncer::TYPED_URLS; }
|
|
|
| // 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;
|
|
|
|
|