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

Unified Diff: components/browser_sync/profile_sync_components_factory_impl.cc

Issue 2723953002: [sync] skeleton implementation of TypedURLSyncBridge (Closed)
Patch Set: Created 3 years, 10 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
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 c5f9a8ddbeb740cb86edf62c20b02932424e4c2c..91d8e754e738a7279f93737f510019f824ce5592 100644
--- a/components/browser_sync/profile_sync_components_factory_impl.cc
+++ b/components/browser_sync/profile_sync_components_factory_impl.cc
@@ -209,9 +209,15 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
// TypedUrl sync is enabled by default. Register unless explicitly disabled,
// or if saving history is disabled.
if (!disabled_types.Has(syncer::TYPED_URLS) && !history_disabled) {
- sync_service->RegisterDataTypeController(
- base::MakeUnique<TypedUrlDataTypeController>(
- error_callback, sync_client_, history_disabled_pref_));
+ if (base::FeatureList::IsEnabled(switches::kSyncUSSTypedURL)) {
+ sync_service->RegisterDataTypeController(
+ base::MakeUnique<ModelTypeController>(syncer::TYPED_URLS,
+ sync_client_, db_thread_));
skym 2017/03/03 17:41:09 db_thread_ ? Are you sure that's right? I don't se
Gang Wu 2017/03/06 08:21:24 will add real implementation later, so add TODO he
+ } else {
+ sync_service->RegisterDataTypeController(
+ base::MakeUnique<TypedUrlDataTypeController>(
+ error_callback, sync_client_, history_disabled_pref_));
+ }
}
// Delete directive sync is enabled by default. Register unless full history

Powered by Google App Engine
This is Rietveld 408576698