diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 23:31:53 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 23:34:38 +0000 |
| commit | 90d7af9e14ee9a506fdb534e489c2d35b077ec76 (patch) | |
| tree | 89aea702f2f417aa7af5077d0f28974898dae7a6 /components/sync_driver/data_type_manager_impl.h | |
| parent | f5de7a00d48ef86eeb126652d9f68ac00ac6db23 (diff) | |
| download | chromium_src-90d7af9e14ee9a506fdb534e489c2d35b077ec76.zip chromium_src-90d7af9e14ee9a506fdb534e489c2d35b077ec76.tar.gz chromium_src-90d7af9e14ee9a506fdb534e489c2d35b077ec76.tar.bz2 | |
Revert 288464 "[Sync] Cleanup datatype configuration error handl..."
Reason for revert: see crbug.com/403098
> [Sync] Cleanup datatype configuration error handling.
>
> The FailedDataTypeHandler is now informed immediately of failures, including
> datatype errors, and is therefore authoritative source for all errors. As such,
> partial success is no longer tracked and the various ModelTypeSets for error
> types in configure results are removed.
>
> BUG=368834,403098
>
> Review URL: https://codereview.chromium.org/420633002
TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/468643002
Cr-Commit-Position: refs/heads/master@{#289115}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/sync_driver/data_type_manager_impl.h')
| -rw-r--r-- | components/sync_driver/data_type_manager_impl.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/sync_driver/data_type_manager_impl.h b/components/sync_driver/data_type_manager_impl.h index 84f96a8..6beb108 100644 --- a/components/sync_driver/data_type_manager_impl.h +++ b/components/sync_driver/data_type_manager_impl.h @@ -68,9 +68,7 @@ class DataTypeManagerImpl : public DataTypeManager, const syncer::DataTypeAssociationStats& association_stats) OVERRIDE; virtual void OnModelAssociationDone( const DataTypeManager::ConfigureResult& result) OVERRIDE; - virtual void OnSingleDataTypeWillStop( - syncer::ModelType type, - const syncer::SyncError& error) OVERRIDE; + virtual void OnSingleDataTypeWillStop(syncer::ModelType type) OVERRIDE; // Used by unit tests. TODO(sync) : This would go away if we made // this class be able to do Dependency injection. crbug.com/129212. @@ -82,7 +80,8 @@ class DataTypeManagerImpl : public DataTypeManager, friend class TestDataTypeManager; // Abort configuration and stop all data types due to configuration errors. - void Abort(ConfigureStatus status); + void Abort(ConfigureStatus status, + const syncer::SyncError& error); // Returns the priority types (control + priority user types). // Virtual for overriding during tests. |