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 "components/browser_sync/profile_sync_components_factory_impl.h" | 5 #include "components/browser_sync/profile_sync_components_factory_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/debug/dump_without_crashing.h" | 9 #include "base/debug/dump_without_crashing.h" |
10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 base::MakeUnique<UIDataTypeController>(syncer::PRIORITY_PREFERENCES, | 276 base::MakeUnique<UIDataTypeController>(syncer::PRIORITY_PREFERENCES, |
277 error_callback, sync_client_)); | 277 error_callback, sync_client_)); |
278 } | 278 } |
279 | 279 |
280 // Article sync is disabled by default. Register only if explicitly enabled. | 280 // Article sync is disabled by default. Register only if explicitly enabled. |
281 if (dom_distiller::IsEnableSyncArticlesSet()) { | 281 if (dom_distiller::IsEnableSyncArticlesSet()) { |
282 sync_service->RegisterDataTypeController( | 282 sync_service->RegisterDataTypeController( |
283 base::MakeUnique<UIDataTypeController>(syncer::ARTICLES, error_callback, | 283 base::MakeUnique<UIDataTypeController>(syncer::ARTICLES, error_callback, |
284 sync_client_)); | 284 sync_client_)); |
285 } | 285 } |
| 286 // Article sync is disabled by default. Register only if explicitly enabled. |
| 287 if (!disabled_types.Has(syncer::READING_LIST)) { |
| 288 sync_service->RegisterDataTypeController( |
| 289 base::MakeUnique<ModelTypeController>( |
| 290 syncer::READING_LIST, base::Bind(&base::debug::DumpWithoutCrashing), |
| 291 sync_client_, base::ThreadTaskRunnerHandle::Get())); |
| 292 } |
286 } | 293 } |
287 | 294 |
288 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( | 295 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( |
289 const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>& | 296 const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>& |
290 debug_info_listener, | 297 debug_info_listener, |
291 const DataTypeController::TypeMap* controllers, | 298 const DataTypeController::TypeMap* controllers, |
292 const syncer::DataTypeEncryptionHandler* encryption_handler, | 299 const syncer::DataTypeEncryptionHandler* encryption_handler, |
293 syncer::SyncBackendHost* backend, | 300 syncer::SyncBackendHost* backend, |
294 DataTypeManagerObserver* observer) { | 301 DataTypeManagerObserver* observer) { |
295 return new DataTypeManagerImpl(debug_info_listener, controllers, | 302 return new DataTypeManagerImpl(debug_info_listener, controllers, |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 | 428 |
422 // static | 429 // static |
423 void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(bool use_uss) { | 430 void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(bool use_uss) { |
424 override_prefs_controller_to_uss_for_test_ = use_uss; | 431 override_prefs_controller_to_uss_for_test_ = use_uss; |
425 } | 432 } |
426 | 433 |
427 bool ProfileSyncComponentsFactoryImpl:: | 434 bool ProfileSyncComponentsFactoryImpl:: |
428 override_prefs_controller_to_uss_for_test_ = false; | 435 override_prefs_controller_to_uss_for_test_ = false; |
429 | 436 |
430 } // namespace browser_sync | 437 } // namespace browser_sync |
OLD | NEW |