diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 15:54:29 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 15:54:29 +0000 |
| commit | 3f98fd98f1cff6aa30fddf33a4db91e4dc3d86af (patch) | |
| tree | 81029562515c79ac858e05e281ee2071e7af8fae /chrome/browser/webdata/autofill_profile_syncable_service.h | |
| parent | c2b751fae48c117978396cab4e4a017b626f6a02 (diff) | |
| download | chromium_src-3f98fd98f1cff6aa30fddf33a4db91e4dc3d86af.zip chromium_src-3f98fd98f1cff6aa30fddf33a4db91e4dc3d86af.tar.gz chromium_src-3f98fd98f1cff6aa30fddf33a4db91e4dc3d86af.tar.bz2 | |
[Sync] Have MergeDataAndStartSyncing return a SyncMergeResult
This will allow us to track merge statistics for datatypes. For now none of
the datatypes fill the SyncMergeResult with anything other than an error.
BUG=158576
TBR=stevet@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11365241
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/webdata/autofill_profile_syncable_service.h')
| -rw-r--r-- | chrome/browser/webdata/autofill_profile_syncable_service.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.h b/chrome/browser/webdata/autofill_profile_syncable_service.h index 10af923..44c88cf 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service.h +++ b/chrome/browser/webdata/autofill_profile_syncable_service.h @@ -47,7 +47,7 @@ class AutofillProfileSyncableService static syncer::ModelType model_type() { return syncer::AUTOFILL_PROFILE; } // syncer::SyncableService implementation. - virtual syncer::SyncError MergeDataAndStartSyncing( + virtual syncer::SyncMergeResult MergeDataAndStartSyncing( syncer::ModelType type, const syncer::SyncDataList& initial_sync_data, scoped_ptr<syncer::SyncChangeProcessor> sync_processor, |