| 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/api/webdata/autofill_web_data_service.h" |
| 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 8 #include "chrome/browser/extensions/api/storage/settings_frontend.h" | 9 #include "chrome/browser/extensions/api/storage/settings_frontend.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/extension_system.h" | 11 #include "chrome/browser/extensions/extension_system.h" |
| 11 #include "chrome/browser/extensions/extension_system_factory.h" | 12 #include "chrome/browser/extensions/extension_system_factory.h" |
| 12 #include "chrome/browser/history/history_service.h" | 13 #include "chrome/browser/history/history_service.h" |
| 13 #include "chrome/browser/history/history_service_factory.h" | 14 #include "chrome/browser/history/history_service_factory.h" |
| 14 #if !defined(OS_ANDROID) | 15 #if !defined(OS_ANDROID) |
| 15 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" | 16 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" |
| 16 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac
tory.h" | 17 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac
tory.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "chrome/browser/sync/glue/typed_url_model_associator.h" | 51 #include "chrome/browser/sync/glue/typed_url_model_associator.h" |
| 51 #include "chrome/browser/sync/glue/ui_data_type_controller.h" | 52 #include "chrome/browser/sync/glue/ui_data_type_controller.h" |
| 52 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" | 53 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" |
| 53 #include "chrome/browser/sync/profile_sync_service.h" | 54 #include "chrome/browser/sync/profile_sync_service.h" |
| 54 #include "chrome/browser/sync/profile_sync_service_factory.h" | 55 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 55 #include "chrome/browser/themes/theme_service.h" | 56 #include "chrome/browser/themes/theme_service.h" |
| 56 #include "chrome/browser/themes/theme_service_factory.h" | 57 #include "chrome/browser/themes/theme_service_factory.h" |
| 57 #include "chrome/browser/themes/theme_syncable_service.h" | 58 #include "chrome/browser/themes/theme_syncable_service.h" |
| 58 #include "chrome/browser/webdata/autocomplete_syncable_service.h" | 59 #include "chrome/browser/webdata/autocomplete_syncable_service.h" |
| 59 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" | 60 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" |
| 60 #include "chrome/browser/webdata/web_data_service.h" | |
| 61 #include "chrome/common/chrome_switches.h" | 61 #include "chrome/common/chrome_switches.h" |
| 62 #include "chrome/common/chrome_version_info.h" | 62 #include "chrome/common/chrome_version_info.h" |
| 63 #include "chrome/common/pref_names.h" | 63 #include "chrome/common/pref_names.h" |
| 64 #include "content/public/browser/browser_thread.h" | 64 #include "content/public/browser/browser_thread.h" |
| 65 #include "sync/api/syncable_service.h" | 65 #include "sync/api/syncable_service.h" |
| 66 | 66 |
| 67 using browser_sync::AutofillDataTypeController; | 67 using browser_sync::AutofillDataTypeController; |
| 68 using browser_sync::AutofillProfileDataTypeController; | 68 using browser_sync::AutofillProfileDataTypeController; |
| 69 using browser_sync::BookmarkChangeProcessor; | 69 using browser_sync::BookmarkChangeProcessor; |
| 70 using browser_sync::BookmarkDataTypeController; | 70 using browser_sync::BookmarkDataTypeController; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 93 using browser_sync::TypedUrlModelAssociator; | 93 using browser_sync::TypedUrlModelAssociator; |
| 94 using browser_sync::UIDataTypeController; | 94 using browser_sync::UIDataTypeController; |
| 95 using content::BrowserThread; | 95 using content::BrowserThread; |
| 96 | 96 |
| 97 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl( | 97 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl( |
| 98 Profile* profile, CommandLine* command_line) | 98 Profile* profile, CommandLine* command_line) |
| 99 : profile_(profile), | 99 : profile_(profile), |
| 100 command_line_(command_line), | 100 command_line_(command_line), |
| 101 extension_system_( | 101 extension_system_( |
| 102 extensions::ExtensionSystemFactory::GetForProfile(profile)), | 102 extensions::ExtensionSystemFactory::GetForProfile(profile)), |
| 103 web_data_service_(WebDataService::FromBrowserContext(profile_)) { | 103 web_data_service_(AutofillWebDataService::FromBrowserContext(profile_)) { |
| 104 } | 104 } |
| 105 | 105 |
| 106 ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() { | 106 ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() { |
| 107 } | 107 } |
| 108 | 108 |
| 109 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes( | 109 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes( |
| 110 ProfileSyncService* pss) { | 110 ProfileSyncService* pss) { |
| 111 RegisterCommonDataTypes(pss); | 111 RegisterCommonDataTypes(pss); |
| 112 #if !defined(OS_ANDROID) | 112 #if !defined(OS_ANDROID) |
| 113 RegisterDesktopDataTypes(pss); | 113 RegisterDesktopDataTypes(pss); |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 ProfileSyncComponentsFactory::SyncComponents | 423 ProfileSyncComponentsFactory::SyncComponents |
| 424 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 424 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
| 425 ProfileSyncService* profile_sync_service, | 425 ProfileSyncService* profile_sync_service, |
| 426 DataTypeErrorHandler* error_handler) { | 426 DataTypeErrorHandler* error_handler) { |
| 427 SessionModelAssociator* model_associator = | 427 SessionModelAssociator* model_associator = |
| 428 new SessionModelAssociator(profile_sync_service, error_handler); | 428 new SessionModelAssociator(profile_sync_service, error_handler); |
| 429 SessionChangeProcessor* change_processor = | 429 SessionChangeProcessor* change_processor = |
| 430 new SessionChangeProcessor(error_handler, model_associator); | 430 new SessionChangeProcessor(error_handler, model_associator); |
| 431 return SyncComponents(model_associator, change_processor); | 431 return SyncComponents(model_associator, change_processor); |
| 432 } | 432 } |
| OLD | NEW |