| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 #include "chrome/browser/spellchecker/spellcheck_factory.h" | 97 #include "chrome/browser/spellchecker/spellcheck_factory.h" |
| 98 #include "chrome/browser/spellchecker/spellcheck_service.h" | 98 #include "chrome/browser/spellchecker/spellcheck_service.h" |
| 99 #endif | 99 #endif |
| 100 | 100 |
| 101 using browser_sync::AutofillDataTypeController; | 101 using browser_sync::AutofillDataTypeController; |
| 102 using browser_sync::AutofillProfileDataTypeController; | 102 using browser_sync::AutofillProfileDataTypeController; |
| 103 using browser_sync::BookmarkChangeProcessor; | 103 using browser_sync::BookmarkChangeProcessor; |
| 104 using browser_sync::BookmarkDataTypeController; | 104 using browser_sync::BookmarkDataTypeController; |
| 105 using browser_sync::BookmarkModelAssociator; | 105 using browser_sync::BookmarkModelAssociator; |
| 106 using browser_sync::ChromeReportUnrecoverableError; | 106 using browser_sync::ChromeReportUnrecoverableError; |
| 107 using browser_sync::DataTypeController; | |
| 108 using browser_sync::DataTypeErrorHandler; | |
| 109 using browser_sync::DataTypeManager; | |
| 110 using browser_sync::DataTypeManagerImpl; | |
| 111 using browser_sync::DataTypeManagerObserver; | |
| 112 using browser_sync::ExtensionBackedDataTypeController; | 107 using browser_sync::ExtensionBackedDataTypeController; |
| 113 using browser_sync::ExtensionDataTypeController; | 108 using browser_sync::ExtensionDataTypeController; |
| 114 using browser_sync::ExtensionSettingDataTypeController; | 109 using browser_sync::ExtensionSettingDataTypeController; |
| 115 using browser_sync::PasswordDataTypeController; | 110 using browser_sync::PasswordDataTypeController; |
| 116 using browser_sync::ProxyDataTypeController; | |
| 117 using browser_sync::SearchEngineDataTypeController; | 111 using browser_sync::SearchEngineDataTypeController; |
| 118 using browser_sync::SessionDataTypeController; | 112 using browser_sync::SessionDataTypeController; |
| 119 using browser_sync::SharedChangeProcessor; | |
| 120 using browser_sync::SyncBackendHost; | 113 using browser_sync::SyncBackendHost; |
| 121 using browser_sync::ThemeDataTypeController; | 114 using browser_sync::ThemeDataTypeController; |
| 122 using browser_sync::TypedUrlChangeProcessor; | 115 using browser_sync::TypedUrlChangeProcessor; |
| 123 using browser_sync::TypedUrlDataTypeController; | 116 using browser_sync::TypedUrlDataTypeController; |
| 124 using browser_sync::TypedUrlModelAssociator; | 117 using browser_sync::TypedUrlModelAssociator; |
| 125 using browser_sync::UIDataTypeController; | |
| 126 using content::BrowserThread; | 118 using content::BrowserThread; |
| 119 using sync_driver::DataTypeController; |
| 120 using sync_driver::DataTypeErrorHandler; |
| 121 using sync_driver::DataTypeManager; |
| 122 using sync_driver::DataTypeManagerImpl; |
| 123 using sync_driver::DataTypeManagerObserver; |
| 124 using sync_driver::ProxyDataTypeController; |
| 125 using sync_driver::SharedChangeProcessor; |
| 126 using sync_driver::UIDataTypeController; |
| 127 | 127 |
| 128 namespace { | 128 namespace { |
| 129 | 129 |
| 130 syncer::ModelTypeSet GetDisabledTypesFromCommandLine( | 130 syncer::ModelTypeSet GetDisabledTypesFromCommandLine( |
| 131 const CommandLine& command_line) { | 131 const CommandLine& command_line) { |
| 132 syncer::ModelTypeSet disabled_types; | 132 syncer::ModelTypeSet disabled_types; |
| 133 std::string disabled_types_str = | 133 std::string disabled_types_str = |
| 134 command_line.GetSwitchValueASCII(switches::kDisableSyncTypes); | 134 command_line.GetSwitchValueASCII(switches::kDisableSyncTypes); |
| 135 disabled_types = syncer::ModelTypeSetFromString(disabled_types_str); | 135 disabled_types = syncer::ModelTypeSetFromString(disabled_types_str); |
| 136 return disabled_types; | 136 return disabled_types; |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 syncer::DICTIONARY, | 443 syncer::DICTIONARY, |
| 444 this)); | 444 this)); |
| 445 } | 445 } |
| 446 #endif | 446 #endif |
| 447 } | 447 } |
| 448 | 448 |
| 449 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( | 449 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( |
| 450 const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>& | 450 const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>& |
| 451 debug_info_listener, | 451 debug_info_listener, |
| 452 const DataTypeController::TypeMap* controllers, | 452 const DataTypeController::TypeMap* controllers, |
| 453 const browser_sync::DataTypeEncryptionHandler* encryption_handler, | 453 const sync_driver::DataTypeEncryptionHandler* encryption_handler, |
| 454 SyncBackendHost* backend, | 454 SyncBackendHost* backend, |
| 455 DataTypeManagerObserver* observer, | 455 DataTypeManagerObserver* observer, |
| 456 browser_sync::FailedDataTypesHandler* failed_data_types_handler) { | 456 sync_driver::FailedDataTypesHandler* failed_data_types_handler) { |
| 457 return new DataTypeManagerImpl(base::Bind(ChromeReportUnrecoverableError), | 457 return new DataTypeManagerImpl(base::Bind(ChromeReportUnrecoverableError), |
| 458 debug_info_listener, | 458 debug_info_listener, |
| 459 controllers, | 459 controllers, |
| 460 encryption_handler, | 460 encryption_handler, |
| 461 backend, | 461 backend, |
| 462 observer, | 462 observer, |
| 463 failed_data_types_handler); | 463 failed_data_types_handler); |
| 464 } | 464 } |
| 465 | 465 |
| 466 browser_sync::SyncBackendHost* | 466 browser_sync::SyncBackendHost* |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 681 attachment_uploader.Pass(), | 681 attachment_uploader.Pass(), |
| 682 attachment_downloader.Pass(), | 682 attachment_downloader.Pass(), |
| 683 delegate)); | 683 delegate)); |
| 684 | 684 |
| 685 return attachment_service.Pass(); | 685 return attachment_service.Pass(); |
| 686 } | 686 } |
| 687 | 687 |
| 688 ProfileSyncComponentsFactory::SyncComponents | 688 ProfileSyncComponentsFactory::SyncComponents |
| 689 ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents( | 689 ProfileSyncComponentsFactoryImpl::CreateBookmarkSyncComponents( |
| 690 ProfileSyncService* profile_sync_service, | 690 ProfileSyncService* profile_sync_service, |
| 691 DataTypeErrorHandler* error_handler) { | 691 sync_driver::DataTypeErrorHandler* error_handler) { |
| 692 BookmarkModel* bookmark_model = | 692 BookmarkModel* bookmark_model = |
| 693 BookmarkModelFactory::GetForProfile(profile_sync_service->profile()); | 693 BookmarkModelFactory::GetForProfile(profile_sync_service->profile()); |
| 694 syncer::UserShare* user_share = profile_sync_service->GetUserShare(); | 694 syncer::UserShare* user_share = profile_sync_service->GetUserShare(); |
| 695 // TODO(akalin): We may want to propagate this switch up eventually. | 695 // TODO(akalin): We may want to propagate this switch up eventually. |
| 696 #if defined(OS_ANDROID) | 696 #if defined(OS_ANDROID) |
| 697 const bool kExpectMobileBookmarksFolder = true; | 697 const bool kExpectMobileBookmarksFolder = true; |
| 698 #else | 698 #else |
| 699 const bool kExpectMobileBookmarksFolder = false; | 699 const bool kExpectMobileBookmarksFolder = false; |
| 700 #endif | 700 #endif |
| 701 BookmarkModelAssociator* model_associator = | 701 BookmarkModelAssociator* model_associator = |
| 702 new BookmarkModelAssociator(bookmark_model, | 702 new BookmarkModelAssociator(bookmark_model, |
| 703 profile_sync_service->profile(), | 703 profile_sync_service->profile(), |
| 704 user_share, | 704 user_share, |
| 705 error_handler, | 705 error_handler, |
| 706 kExpectMobileBookmarksFolder); | 706 kExpectMobileBookmarksFolder); |
| 707 BookmarkChangeProcessor* change_processor = | 707 BookmarkChangeProcessor* change_processor = |
| 708 new BookmarkChangeProcessor(profile_sync_service->profile(), | 708 new BookmarkChangeProcessor(profile_sync_service->profile(), |
| 709 model_associator, | 709 model_associator, |
| 710 error_handler); | 710 error_handler); |
| 711 return SyncComponents(model_associator, change_processor); | 711 return SyncComponents(model_associator, change_processor); |
| 712 } | 712 } |
| 713 | 713 |
| 714 ProfileSyncComponentsFactory::SyncComponents | 714 ProfileSyncComponentsFactory::SyncComponents |
| 715 ProfileSyncComponentsFactoryImpl::CreateTypedUrlSyncComponents( | 715 ProfileSyncComponentsFactoryImpl::CreateTypedUrlSyncComponents( |
| 716 ProfileSyncService* profile_sync_service, | 716 ProfileSyncService* profile_sync_service, |
| 717 history::HistoryBackend* history_backend, | 717 history::HistoryBackend* history_backend, |
| 718 browser_sync::DataTypeErrorHandler* error_handler) { | 718 sync_driver::DataTypeErrorHandler* error_handler) { |
| 719 TypedUrlModelAssociator* model_associator = | 719 TypedUrlModelAssociator* model_associator = |
| 720 new TypedUrlModelAssociator(profile_sync_service, | 720 new TypedUrlModelAssociator(profile_sync_service, |
| 721 history_backend, | 721 history_backend, |
| 722 error_handler); | 722 error_handler); |
| 723 TypedUrlChangeProcessor* change_processor = | 723 TypedUrlChangeProcessor* change_processor = |
| 724 new TypedUrlChangeProcessor(profile_, | 724 new TypedUrlChangeProcessor(profile_, |
| 725 model_associator, | 725 model_associator, |
| 726 history_backend, | 726 history_backend, |
| 727 error_handler); | 727 error_handler); |
| 728 return SyncComponents(model_associator, change_processor); | 728 return SyncComponents(model_associator, change_processor); |
| 729 } | 729 } |
| OLD | NEW |