Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: components/sync_driver/data_type_manager_impl.h

Issue 534733002: Revert "[Sync] Move DataTypeStatusTable ownership into DataTypeManager." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync_driver/data_type_manager.h ('k') | components/sync_driver/data_type_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_driver/data_type_manager_impl.h
diff --git a/components/sync_driver/data_type_manager_impl.h b/components/sync_driver/data_type_manager_impl.h
index 7d0b101ed3eb044a079b699cc093724d076a4479..abd7fbc0edfa6e7f82f10d94d96d5321a83d10f6 100644
--- a/components/sync_driver/data_type_manager_impl.h
+++ b/components/sync_driver/data_type_manager_impl.h
@@ -30,6 +30,7 @@ namespace sync_driver {
class DataTypeController;
class DataTypeEncryptionHandler;
class DataTypeManagerObserver;
+class DataTypeStatusTable;
// List of data types grouped by priority and ordered from high priority to
// low priority.
@@ -45,14 +46,14 @@ class DataTypeManagerImpl : public DataTypeManager,
const DataTypeController::TypeMap* controllers,
const DataTypeEncryptionHandler* encryption_handler,
BackendDataTypeConfigurer* configurer,
- DataTypeManagerObserver* observer);
+ DataTypeManagerObserver* observer,
+ DataTypeStatusTable* data_type_status_table);
virtual ~DataTypeManagerImpl();
// DataTypeManager interface.
virtual void Configure(syncer::ModelTypeSet desired_types,
syncer::ConfigureReason reason) OVERRIDE;
virtual void ReenableType(syncer::ModelType type) OVERRIDE;
- virtual void ResetDataTypeErrors() OVERRIDE;
// Needed only for backend migration.
virtual void PurgeForMigration(
@@ -162,7 +163,7 @@ class DataTypeManagerImpl : public DataTypeManager,
// For querying failed data types (having unrecoverable error) when
// configuring backend.
- DataTypeStatusTable data_type_status_table_;
+ DataTypeStatusTable* data_type_status_table_;
// Types waiting to be downloaded.
TypeSetPriorityList download_types_queue_;
« no previous file with comments | « components/sync_driver/data_type_manager.h ('k') | components/sync_driver/data_type_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698