| 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" |
| 11 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" | 11 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" |
| 12 #include "chrome/browser/extensions/api/storage/settings_frontend.h" | 12 #include "chrome/browser/extensions/api/storage/settings_frontend.h" |
| 13 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
| 14 #include "chrome/browser/extensions/extension_sync_service.h" | 14 #include "chrome/browser/extensions/extension_sync_service.h" |
| 15 #include "chrome/browser/extensions/extension_system.h" | |
| 16 #include "chrome/browser/extensions/extension_system_factory.h" | 15 #include "chrome/browser/extensions/extension_system_factory.h" |
| 17 #include "chrome/browser/history/history_service.h" | 16 #include "chrome/browser/history/history_service.h" |
| 18 #include "chrome/browser/history/history_service_factory.h" | 17 #include "chrome/browser/history/history_service_factory.h" |
| 19 #include "chrome/browser/pref_service_flags_storage.h" | 18 #include "chrome/browser/pref_service_flags_storage.h" |
| 20 #include "chrome/browser/prefs/pref_model_associator.h" | 19 #include "chrome/browser/prefs/pref_model_associator.h" |
| 21 #include "chrome/browser/prefs/pref_service_syncable.h" | 20 #include "chrome/browser/prefs/pref_service_syncable.h" |
| 22 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
| 23 #include "chrome/browser/search_engines/template_url_service.h" | 22 #include "chrome/browser/search_engines/template_url_service.h" |
| 24 #include "chrome/browser/search_engines/template_url_service_factory.h" | 23 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 25 #include "chrome/browser/signin/signin_manager.h" | 24 #include "chrome/browser/signin/signin_manager.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" | 59 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
| 61 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" | 60 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" |
| 62 #include "chrome/browser/webdata/autocomplete_syncable_service.h" | 61 #include "chrome/browser/webdata/autocomplete_syncable_service.h" |
| 63 #include "chrome/browser/webdata/web_data_service_factory.h" | 62 #include "chrome/browser/webdata/web_data_service_factory.h" |
| 64 #include "chrome/common/chrome_switches.h" | 63 #include "chrome/common/chrome_switches.h" |
| 65 #include "chrome/common/pref_names.h" | 64 #include "chrome/common/pref_names.h" |
| 66 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_ser
vice.h" | 65 #include "components/autofill/core/browser/webdata/autofill_profile_syncable_ser
vice.h" |
| 67 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" | 66 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" |
| 68 #include "components/dom_distiller/core/dom_distiller_service.h" | 67 #include "components/dom_distiller/core/dom_distiller_service.h" |
| 69 #include "content/public/browser/browser_thread.h" | 68 #include "content/public/browser/browser_thread.h" |
| 69 #include "extensions/browser/extension_system.h" |
| 70 #include "sync/api/syncable_service.h" | 70 #include "sync/api/syncable_service.h" |
| 71 | 71 |
| 72 #if defined(ENABLE_MANAGED_USERS) | 72 #if defined(ENABLE_MANAGED_USERS) |
| 73 #include "chrome/browser/managed_mode/managed_user_settings_service.h" | 73 #include "chrome/browser/managed_mode/managed_user_settings_service.h" |
| 74 #include "chrome/browser/managed_mode/managed_user_settings_service_factory.h" | 74 #include "chrome/browser/managed_mode/managed_user_settings_service_factory.h" |
| 75 #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h" | 75 #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h" |
| 76 #include "chrome/browser/managed_mode/managed_user_shared_settings_service_facto
ry.h" | 76 #include "chrome/browser/managed_mode/managed_user_shared_settings_service_facto
ry.h" |
| 77 #include "chrome/browser/managed_mode/managed_user_sync_service.h" | 77 #include "chrome/browser/managed_mode/managed_user_sync_service.h" |
| 78 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" | 78 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" |
| 79 #endif | 79 #endif |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 using browser_sync::TypedUrlChangeProcessor; | 116 using browser_sync::TypedUrlChangeProcessor; |
| 117 using browser_sync::TypedUrlDataTypeController; | 117 using browser_sync::TypedUrlDataTypeController; |
| 118 using browser_sync::TypedUrlModelAssociator; | 118 using browser_sync::TypedUrlModelAssociator; |
| 119 using browser_sync::UIDataTypeController; | 119 using browser_sync::UIDataTypeController; |
| 120 using content::BrowserThread; | 120 using content::BrowserThread; |
| 121 | 121 |
| 122 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl( | 122 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl( |
| 123 Profile* profile, CommandLine* command_line) | 123 Profile* profile, CommandLine* command_line) |
| 124 : profile_(profile), | 124 : profile_(profile), |
| 125 command_line_(command_line), | 125 command_line_(command_line), |
| 126 extension_system_( | 126 extension_system_(extensions::ExtensionSystem::Get(profile)), |
| 127 extensions::ExtensionSystemFactory::GetForProfile(profile)), | |
| 128 web_data_service_( | 127 web_data_service_( |
| 129 WebDataServiceFactory::GetAutofillWebDataForProfile( | 128 WebDataServiceFactory::GetAutofillWebDataForProfile( |
| 130 profile_, Profile::EXPLICIT_ACCESS)) { | 129 profile_, Profile::EXPLICIT_ACCESS)) { |
| 131 } | 130 } |
| 132 | 131 |
| 133 ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() { | 132 ProfileSyncComponentsFactoryImpl::~ProfileSyncComponentsFactoryImpl() { |
| 134 } | 133 } |
| 135 | 134 |
| 136 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes( | 135 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes( |
| 137 ProfileSyncService* pss) { | 136 ProfileSyncService* pss) { |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 ProfileSyncComponentsFactory::SyncComponents | 536 ProfileSyncComponentsFactory::SyncComponents |
| 538 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 537 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
| 539 ProfileSyncService* profile_sync_service, | 538 ProfileSyncService* profile_sync_service, |
| 540 DataTypeErrorHandler* error_handler) { | 539 DataTypeErrorHandler* error_handler) { |
| 541 SessionModelAssociator* model_associator = | 540 SessionModelAssociator* model_associator = |
| 542 new SessionModelAssociator(profile_sync_service, error_handler); | 541 new SessionModelAssociator(profile_sync_service, error_handler); |
| 543 SessionChangeProcessor* change_processor = | 542 SessionChangeProcessor* change_processor = |
| 544 new SessionChangeProcessor(error_handler, model_associator); | 543 new SessionChangeProcessor(error_handler, model_associator); |
| 545 return SyncComponents(model_associator, change_processor); | 544 return SyncComponents(model_associator, change_processor); |
| 546 } | 545 } |
| OLD | NEW |