diff options
author | skym <skym@chromium.org> | 2015-12-01 09:57:36 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 17:58:40 +0000 |
commit | e740bd4b6bc9ed9e2e607026c2fbc3ca4091ad5c (patch) | |
tree | aa50845af3609ceefc9b3641e8cc52bf082c6580 /components | |
parent | 7652b1ef26c36c9c9badcc5539568d9e1539befe (diff) | |
download | chromium_src-e740bd4b6bc9ed9e2e607026c2fbc3ca4091ad5c.zip chromium_src-e740bd4b6bc9ed9e2e607026c2fbc3ca4091ad5c.tar.gz chromium_src-e740bd4b6bc9ed9e2e607026c2fbc3ca4091ad5c.tar.bz2 |
[Sync] Renaming MetadataChanges to MetadataChangeList, slight metadata ownership tweak, and adding a few stub methods.
BUG=543405
Review URL: https://codereview.chromium.org/1478593002
Cr-Commit-Position: refs/heads/master@{#362450}
Diffstat (limited to 'components')
-rw-r--r-- | components/sync_driver/device_info_service.cc | 10 | ||||
-rw-r--r-- | components/sync_driver/device_info_service.h | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/components/sync_driver/device_info_service.cc b/components/sync_driver/device_info_service.cc index f210b2f..0a5949e 100644 --- a/components/sync_driver/device_info_service.cc +++ b/components/sync_driver/device_info_service.cc @@ -34,20 +34,20 @@ DeviceInfoService::DeviceInfoService( DeviceInfoService::~DeviceInfoService() {} -syncer_v2::MetadataChanges* DeviceInfoService::CreateMetadataChanges() { - // TODO(skym): Implementation. - return nullptr; +scoped_ptr<syncer_v2::MetadataChangeList> +DeviceInfoService::CreateMetadataChangeList() { + return make_scoped_ptr(new syncer_v2::SimpleMetadataChangeList()); } syncer::SyncError DeviceInfoService::MergeSyncData( - syncer_v2::MetadataChanges* metadata_changes, + scoped_ptr<syncer_v2::MetadataChangeList> metadata_change_list, syncer_v2::EntityDataList entity_data_list) { // TODO(skym): Implementation. return syncer::SyncError(); } syncer::SyncError DeviceInfoService::ApplySyncChanges( - syncer_v2::MetadataChanges* metadata_changes, + scoped_ptr<syncer_v2::MetadataChangeList> metadata_change_list, syncer_v2::EntityChangeList entity_changes) { // TODO(skym): Implementation. return syncer::SyncError(); diff --git a/components/sync_driver/device_info_service.h b/components/sync_driver/device_info_service.h index 76a4126..fdd1127 100644 --- a/components/sync_driver/device_info_service.h +++ b/components/sync_driver/device_info_service.h @@ -15,6 +15,7 @@ #include "components/sync_driver/device_info_tracker.h" #include "components/sync_driver/local_device_info_provider.h" #include "sync/api/model_type_service.h" +#include "sync/internal_api/public/simple_metadata_change_list.h" namespace syncer { class SyncError; @@ -41,12 +42,12 @@ class DeviceInfoService : public syncer_v2::ModelTypeService, ~DeviceInfoService() override; // ModelTypeService implementation. - syncer_v2::MetadataChanges* CreateMetadataChanges() override; + scoped_ptr<syncer_v2::MetadataChangeList> CreateMetadataChangeList() override; syncer::SyncError MergeSyncData( - syncer_v2::MetadataChanges* metadata_changes, + scoped_ptr<syncer_v2::MetadataChangeList> metadata_change_list, syncer_v2::EntityDataList entity_data_list) override; syncer::SyncError ApplySyncChanges( - syncer_v2::MetadataChanges* metadata_changes, + scoped_ptr<syncer_v2::MetadataChangeList> metadata_change_list, syncer_v2::EntityChangeList entity_changes) override; void LoadMetadata(MetadataCallback callback) override; void GetData(ClientKeyList client_keys, DataCallback callback) override; |