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

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

Issue 14344002: Sync: Turn on full history sync by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix use-after-free. Created 7 years, 8 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 9049b7627877f1948ec72295b3ea8ecec8225131..6cf9b9b6bf5506fbbd8adb45f3dfa2c490c88539 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -146,11 +146,9 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
new TypedUrlDataTypeController(this, profile_, pss));
}
- // Unless it is explicitly disabled, history delete directive sync is
- // enabled whenever full history sync is enabled.
- if (command_line_->HasSwitch(switches::kHistoryEnableFullHistorySync) &&
- !command_line_->HasSwitch(
- switches::kDisableSyncHistoryDeleteDirectives)) {
+ // Delete directive sync is enabled by default. Register unless full history
+ // sync is disabled.
+ if (!command_line_->HasSwitch(switches::kHistoryDisableFullHistorySync)) {
pss->RegisterDataTypeController(
new UIDataTypeController(
syncer::HISTORY_DELETE_DIRECTIVES, this, profile_, pss));

Powered by Google App Engine
This is Rietveld 408576698