| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 8 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" | 8 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
| 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" | 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" |
| 10 #include "chrome/browser/history/history_service.h" | 10 #include "chrome/browser/history/history_service.h" |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 this)); | 243 this)); |
| 244 } | 244 } |
| 245 | 245 |
| 246 // Session sync is enabled by default. Register unless explicitly disabled. | 246 // Session sync is enabled by default. Register unless explicitly disabled. |
| 247 if (!disabled_types.Has(syncer::PROXY_TABS)) { | 247 if (!disabled_types.Has(syncer::PROXY_TABS)) { |
| 248 pss->RegisterDataTypeController(new ProxyDataTypeController( | 248 pss->RegisterDataTypeController(new ProxyDataTypeController( |
| 249 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), | 249 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |
| 250 syncer::PROXY_TABS)); | 250 syncer::PROXY_TABS)); |
| 251 pss->RegisterDataTypeController( | 251 pss->RegisterDataTypeController( |
| 252 new SessionDataTypeController( | 252 new SessionDataTypeController( |
| 253 this, profile_, MakeDisableCallbackFor(syncer::SESSIONS))); | 253 this, |
| 254 profile_, |
| 255 pss->GetSyncedWindowDelegatesGetter(), |
| 256 pss->GetLocalDeviceInfoProvider(), |
| 257 MakeDisableCallbackFor(syncer::SESSIONS))); |
| 254 } | 258 } |
| 255 | 259 |
| 256 // Favicon sync is enabled by default. Register unless explicitly disabled. | 260 // Favicon sync is enabled by default. Register unless explicitly disabled. |
| 257 if (!disabled_types.Has(syncer::FAVICON_IMAGES) && | 261 if (!disabled_types.Has(syncer::FAVICON_IMAGES) && |
| 258 !disabled_types.Has(syncer::FAVICON_TRACKING)) { | 262 !disabled_types.Has(syncer::FAVICON_TRACKING)) { |
| 259 pss->RegisterDataTypeController( | 263 pss->RegisterDataTypeController( |
| 260 new UIDataTypeController( | 264 new UIDataTypeController( |
| 261 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), | 265 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |
| 262 base::Bind(&ChromeReportUnrecoverableError), | 266 base::Bind(&ChromeReportUnrecoverableError), |
| 263 MakeDisableCallbackFor(syncer::FAVICON_IMAGES), | 267 MakeDisableCallbackFor(syncer::FAVICON_IMAGES), |
| (...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 707 new TypedUrlModelAssociator(profile_sync_service, | 711 new TypedUrlModelAssociator(profile_sync_service, |
| 708 history_backend, | 712 history_backend, |
| 709 error_handler); | 713 error_handler); |
| 710 TypedUrlChangeProcessor* change_processor = | 714 TypedUrlChangeProcessor* change_processor = |
| 711 new TypedUrlChangeProcessor(profile_, | 715 new TypedUrlChangeProcessor(profile_, |
| 712 model_associator, | 716 model_associator, |
| 713 history_backend, | 717 history_backend, |
| 714 error_handler); | 718 error_handler); |
| 715 return SyncComponents(model_associator, change_processor); | 719 return SyncComponents(model_associator, change_processor); |
| 716 } | 720 } |
| OLD | NEW |