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

Unified Diff: chrome/browser/sync/profile_sync_components_factory_impl.cc

Issue 12096116: Enable dictionary sync by default (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge master Created 7 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: chrome/browser/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 752ebaf06a056f065b49294784e82216289daee3..e662a3db651bd7aea44babd2ba9c5124a4336110 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -237,12 +237,13 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
syncer::HISTORY_DELETE_DIRECTIVES, this, profile_, pss));
}
- // Dictionary sync is disabled by default. Register only if explicitly
- // enabled.
- if (command_line_->HasSwitch(switches::kEnableSyncDictionary)) {
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
+ // Dictionary sync is enabled by default.
+ if (!command_line_->HasSwitch(switches::kDisableSyncDictionary)) {
pss->RegisterDataTypeController(
new UIDataTypeController(syncer::DICTIONARY, this, profile_, pss));
}
+#endif
}
DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(

Powered by Google App Engine
This is Rietveld 408576698