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

Unified Diff: components/sync/driver/glue/sync_backend_host_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/sync/driver/glue/sync_backend_host_impl.cc
diff --git a/components/sync/driver/glue/sync_backend_host_impl.cc b/components/sync/driver/glue/sync_backend_host_impl.cc
index 77be61bda6d654fe39f79aaf09c9deb61115fe4a..e8b4acc174e8e51c6ed99026d9e063e398cd2288 100644
--- a/components/sync/driver/glue/sync_backend_host_impl.cc
+++ b/components/sync/driver/glue/sync_backend_host_impl.cc
@@ -539,6 +539,7 @@ void SyncBackendHostImpl::AddExperimentalTypes() {
}
void SyncBackendHostImpl::HandleInitializationSuccessOnFrontendLoop(
+ ModelTypeSet initial_types,
const WeakHandle<JsBackend> js_backend,
const WeakHandle<DataTypeDebugInfoListener> debug_info_listener,
std::unique_ptr<ModelTypeConnector> model_type_connector,
@@ -562,12 +563,13 @@ void SyncBackendHostImpl::HandleInitializationSuccessOnFrontendLoop(
// experimental types to enable. This should be done before we inform
// the host to ensure they're visible in the customize screen.
AddExperimentalTypes();
- host_->OnEngineInitialized(js_backend, debug_info_listener, cache_guid, true);
+ host_->OnEngineInitialized(initial_types, js_backend, debug_info_listener,
+ cache_guid, true);
}
void SyncBackendHostImpl::HandleInitializationFailureOnFrontendLoop() {
DCHECK(thread_checker_.CalledOnValidThread());
- host_->OnEngineInitialized(WeakHandle<JsBackend>(),
+ host_->OnEngineInitialized(ModelTypeSet(), WeakHandle<JsBackend>(),
WeakHandle<DataTypeDebugInfoListener>(), "",
false);
}
« no previous file with comments | « components/sync/driver/glue/sync_backend_host_impl.h ('k') | components/sync/driver/glue/sync_backend_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698