Index: chrome/browser/extensions/api/storage/sync_storage_backend.h |
diff --git a/chrome/browser/extensions/api/storage/sync_storage_backend.h b/chrome/browser/extensions/api/storage/sync_storage_backend.h |
index ad816778e8e63e458fa95ceac21bbd7fcb82b3d2..080fa8e7e3d9d9e8fcb27284f1ba91129909ea09 100644 |
--- a/chrome/browser/extensions/api/storage/sync_storage_backend.h |
+++ b/chrome/browser/extensions/api/storage/sync_storage_backend.h |
@@ -45,23 +45,22 @@ class SyncStorageBackend : public syncer::SyncableService { |
syncer::ModelType sync_type, |
const syncer::SyncableService::StartSyncFlare& flare); |
- virtual ~SyncStorageBackend(); |
+ ~SyncStorageBackend() override; |
virtual ValueStore* GetStorage(const std::string& extension_id); |
virtual void DeleteStorage(const std::string& extension_id); |
// syncer::SyncableService implementation. |
- virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) |
- const override; |
- virtual syncer::SyncMergeResult MergeDataAndStartSyncing( |
+ syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override; |
+ 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 syncer::SyncError ProcessSyncChanges( |
+ syncer::SyncError ProcessSyncChanges( |
const tracked_objects::Location& from_here, |
const syncer::SyncChangeList& change_list) override; |
- virtual void StopSyncing(syncer::ModelType type) override; |
+ void StopSyncing(syncer::ModelType type) override; |
private: |
// Gets a weak reference to the storage area for a given extension, |