diff options
Diffstat (limited to 'chrome/browser/extensions/extension_service.h')
| -rw-r--r-- | chrome/browser/extensions/extension_service.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 7fa2eb1..4f8d737 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -461,7 +461,7 @@ class ExtensionService virtual void CheckForUpdatesSoon() OVERRIDE; // 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, |