| 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/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
| 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 9 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" | 9 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 browser_sync::FailedDataTypesHandler* failed_data_types_handler) { | 407 browser_sync::FailedDataTypesHandler* failed_data_types_handler) { |
| 408 return new DataTypeManagerImpl(debug_info_listener, | 408 return new DataTypeManagerImpl(debug_info_listener, |
| 409 controllers, | 409 controllers, |
| 410 encryption_handler, | 410 encryption_handler, |
| 411 backend, | 411 backend, |
| 412 observer, | 412 observer, |
| 413 failed_data_types_handler); | 413 failed_data_types_handler); |
| 414 } | 414 } |
| 415 | 415 |
| 416 browser_sync::SyncBackendHost* | 416 browser_sync::SyncBackendHost* |
| 417 ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost( | 417 ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost( |
| 418 const std::string& name, | 418 const std::string& name, |
| 419 Profile* profile, | 419 Profile* profile, |
| 420 const base::WeakPtr<browser_sync::SyncPrefs>& sync_prefs) { | 420 const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs) { |
| 421 return new browser_sync::SyncBackendHostImpl(name, profile, sync_prefs); | 421 return new browser_sync::SyncBackendHostImpl(name, profile, sync_prefs); |
| 422 } | 422 } |
| 423 | 423 |
| 424 browser_sync::GenericChangeProcessor* | 424 browser_sync::GenericChangeProcessor* |
| 425 ProfileSyncComponentsFactoryImpl::CreateGenericChangeProcessor( | 425 ProfileSyncComponentsFactoryImpl::CreateGenericChangeProcessor( |
| 426 ProfileSyncService* profile_sync_service, | 426 ProfileSyncService* profile_sync_service, |
| 427 browser_sync::DataTypeErrorHandler* error_handler, | 427 browser_sync::DataTypeErrorHandler* error_handler, |
| 428 const base::WeakPtr<syncer::SyncableService>& local_service, | 428 const base::WeakPtr<syncer::SyncableService>& local_service, |
| 429 const base::WeakPtr<syncer::SyncMergeResult>& merge_result) { | 429 const base::WeakPtr<syncer::SyncMergeResult>& merge_result) { |
| 430 syncer::UserShare* user_share = profile_sync_service->GetUserShare(); | 430 syncer::UserShare* user_share = profile_sync_service->GetUserShare(); |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 ProfileSyncComponentsFactory::SyncComponents | 607 ProfileSyncComponentsFactory::SyncComponents |
| 608 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 608 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
| 609 ProfileSyncService* profile_sync_service, | 609 ProfileSyncService* profile_sync_service, |
| 610 DataTypeErrorHandler* error_handler) { | 610 DataTypeErrorHandler* error_handler) { |
| 611 SessionModelAssociator* model_associator = | 611 SessionModelAssociator* model_associator = |
| 612 new SessionModelAssociator(profile_sync_service, error_handler); | 612 new SessionModelAssociator(profile_sync_service, error_handler); |
| 613 SessionChangeProcessor* change_processor = | 613 SessionChangeProcessor* change_processor = |
| 614 new SessionChangeProcessor(error_handler, model_associator); | 614 new SessionChangeProcessor(error_handler, model_associator); |
| 615 return SyncComponents(model_associator, change_processor); | 615 return SyncComponents(model_associator, change_processor); |
| 616 } | 616 } |
| OLD | NEW |