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

Unified Diff: components/browser_sync/profile_sync_components_factory_impl.cc

Issue 2555433003: [Sync] Plumb initial type set from engine to DTM. (Closed)
Patch Set: Rebase. Created 4 years 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
Index: components/browser_sync/profile_sync_components_factory_impl.cc
diff --git a/components/browser_sync/profile_sync_components_factory_impl.cc b/components/browser_sync/profile_sync_components_factory_impl.cc
index aa5c627f66535324f0c5a51c8e8296111a5cac76..00f400dc36036cce7762c45fb68988305de81a7e 100644
--- a/components/browser_sync/profile_sync_components_factory_impl.cc
+++ b/components/browser_sync/profile_sync_components_factory_impl.cc
@@ -52,15 +52,15 @@ using bookmarks::BookmarkModel;
using sync_bookmarks::BookmarkChangeProcessor;
using sync_bookmarks::BookmarkDataTypeController;
using sync_bookmarks::BookmarkModelAssociator;
+using sync_sessions::SessionDataTypeController;
+using syncer::AsyncDirectoryTypeController;
using syncer::DataTypeController;
using syncer::DataTypeManager;
using syncer::DataTypeManagerImpl;
using syncer::DataTypeManagerObserver;
using syncer::DeviceInfoDataTypeController;
-using syncer::ProxyDataTypeController;
using syncer::ModelTypeController;
-using syncer::AsyncDirectoryTypeController;
-using sync_sessions::SessionDataTypeController;
+using syncer::ProxyDataTypeController;
namespace browser_sync {
@@ -297,14 +297,16 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
}
DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(
+ syncer::ModelTypeSet initial_types,
const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
debug_info_listener,
const DataTypeController::TypeMap* controllers,
const syncer::DataTypeEncryptionHandler* encryption_handler,
- syncer::SyncEngine* engine,
+ syncer::ModelTypeConfigurer* configurer,
DataTypeManagerObserver* observer) {
- return new DataTypeManagerImpl(debug_info_listener, controllers,
- encryption_handler, engine, observer);
+ return new DataTypeManagerImpl(initial_types, debug_info_listener,
+ controllers, encryption_handler, configurer,
+ observer);
}
syncer::SyncEngine* ProfileSyncComponentsFactoryImpl::CreateSyncEngine(
« no previous file with comments | « components/browser_sync/profile_sync_components_factory_impl.h ('k') | components/browser_sync/profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698