| 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 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 browser_sync::FailedDataTypesHandler* failed_data_types_handler) { | 423 browser_sync::FailedDataTypesHandler* failed_data_types_handler) { |
| 424 return new DataTypeManagerImpl(debug_info_listener, | 424 return new DataTypeManagerImpl(debug_info_listener, |
| 425 controllers, | 425 controllers, |
| 426 encryption_handler, | 426 encryption_handler, |
| 427 backend, | 427 backend, |
| 428 observer, | 428 observer, |
| 429 failed_data_types_handler); | 429 failed_data_types_handler); |
| 430 } | 430 } |
| 431 | 431 |
| 432 browser_sync::SyncBackendHost* | 432 browser_sync::SyncBackendHost* |
| 433 ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost( | 433 ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost( |
| 434 const std::string& name, | 434 const std::string& name, |
| 435 Profile* profile, | 435 Profile* profile, |
| 436 const base::WeakPtr<browser_sync::SyncPrefs>& sync_prefs) { | 436 const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs) { |
| 437 return new browser_sync::SyncBackendHostImpl(name, profile, sync_prefs); | 437 return new browser_sync::SyncBackendHostImpl(name, profile, sync_prefs); |
| 438 } | 438 } |
| 439 | 439 |
| 440 browser_sync::GenericChangeProcessor* | 440 browser_sync::GenericChangeProcessor* |
| 441 ProfileSyncComponentsFactoryImpl::CreateGenericChangeProcessor( | 441 ProfileSyncComponentsFactoryImpl::CreateGenericChangeProcessor( |
| 442 ProfileSyncService* profile_sync_service, | 442 ProfileSyncService* profile_sync_service, |
| 443 browser_sync::DataTypeErrorHandler* error_handler, | 443 browser_sync::DataTypeErrorHandler* error_handler, |
| 444 const base::WeakPtr<syncer::SyncableService>& local_service, | 444 const base::WeakPtr<syncer::SyncableService>& local_service, |
| 445 const base::WeakPtr<syncer::SyncMergeResult>& merge_result) { | 445 const base::WeakPtr<syncer::SyncMergeResult>& merge_result) { |
| 446 syncer::UserShare* user_share = profile_sync_service->GetUserShare(); | 446 syncer::UserShare* user_share = profile_sync_service->GetUserShare(); |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 ProfileSyncComponentsFactory::SyncComponents | 625 ProfileSyncComponentsFactory::SyncComponents |
| 626 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 626 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
| 627 ProfileSyncService* profile_sync_service, | 627 ProfileSyncService* profile_sync_service, |
| 628 DataTypeErrorHandler* error_handler) { | 628 DataTypeErrorHandler* error_handler) { |
| 629 SessionModelAssociator* model_associator = | 629 SessionModelAssociator* model_associator = |
| 630 new SessionModelAssociator(profile_sync_service, error_handler); | 630 new SessionModelAssociator(profile_sync_service, error_handler); |
| 631 SessionChangeProcessor* change_processor = | 631 SessionChangeProcessor* change_processor = |
| 632 new SessionChangeProcessor(error_handler, model_associator); | 632 new SessionChangeProcessor(error_handler, model_associator); |
| 633 return SyncComponents(model_associator, change_processor); | 633 return SyncComponents(model_associator, change_processor); |
| 634 } | 634 } |
| OLD | NEW |