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

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

Issue 394223002: Disable tab syncing when history saving is disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 6 years, 4 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 ba1b8cef542dba6a5cebf96fd6684f6a18a8e5a7..68ef4a4e5f653ccd79ca00313db48701a226efb0 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -228,11 +228,14 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
pss->RegisterDataTypeController(new ProxyDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
Andrew T Wilson (Slow) 2014/08/21 14:10:37 Move this inside the if(pref) below?
Joao da Silva 2014/08/26 16:06:51 Done.
syncer::PROXY_TABS));
- pss->RegisterDataTypeController(
- new SessionDataTypeController(this,
- profile_,
- pss->GetSyncedWindowDelegatesGetter(),
- pss->GetLocalDeviceInfoProvider()));
+ if (!profile_->GetPrefs()->GetBoolean(
+ prefs::kSavingBrowserHistoryDisabled)) {
+ pss->RegisterDataTypeController(
+ new SessionDataTypeController(this,
+ profile_,
+ pss->GetSyncedWindowDelegatesGetter(),
+ pss->GetLocalDeviceInfoProvider()));
+ }
}
// Favicon sync is enabled by default. Register unless explicitly disabled.

Powered by Google App Engine
This is Rietveld 408576698