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. |