| Index: components/password_manager/core/browser/password_syncable_service.h
|
| diff --git a/components/password_manager/core/browser/password_syncable_service.h b/components/password_manager/core/browser/password_syncable_service.h
|
| index afec988d0e01f22e770197c36c09d01f1bdb6095..24ad460ba5d3a7b7b190fdbd6426e11060140d31 100644
|
| --- a/components/password_manager/core/browser/password_syncable_service.h
|
| +++ b/components/password_manager/core/browser/password_syncable_service.h
|
| @@ -42,18 +42,17 @@ class PasswordSyncableService : public syncer::SyncableService,
|
| // |password_store|, the constructor doesn't take ownership of the
|
| // |password_store|.
|
| explicit PasswordSyncableService(PasswordStoreSync* password_store);
|
| - virtual ~PasswordSyncableService();
|
| + ~PasswordSyncableService() override;
|
|
|
| // 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> 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;
|
|
|
|
|