| 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/extensions/app_notification_manager.h" | 7 #include "chrome/browser/extensions/app_notification_manager.h" |
| 8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
| 9 #include "chrome/browser/extensions/settings/settings_frontend.h" | 9 #include "chrome/browser/extensions/settings/settings_frontend.h" |
| 10 #include "chrome/browser/prefs/pref_model_associator.h" | 10 #include "chrome/browser/prefs/pref_model_associator.h" |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 return SyncComponents(model_associator, change_processor); | 281 return SyncComponents(model_associator, change_processor); |
| 282 } | 282 } |
| 283 | 283 |
| 284 ProfileSyncComponentsFactory::SyncComponents | 284 ProfileSyncComponentsFactory::SyncComponents |
| 285 ProfileSyncComponentsFactoryImpl::CreatePasswordSyncComponents( | 285 ProfileSyncComponentsFactoryImpl::CreatePasswordSyncComponents( |
| 286 ProfileSyncService* profile_sync_service, | 286 ProfileSyncService* profile_sync_service, |
| 287 PasswordStore* password_store, | 287 PasswordStore* password_store, |
| 288 DataTypeErrorHandler* error_handler) { | 288 DataTypeErrorHandler* error_handler) { |
| 289 PasswordModelAssociator* model_associator = | 289 PasswordModelAssociator* model_associator = |
| 290 new PasswordModelAssociator(profile_sync_service, | 290 new PasswordModelAssociator(profile_sync_service, |
| 291 password_store); | 291 password_store, |
| 292 error_handler); |
| 292 PasswordChangeProcessor* change_processor = | 293 PasswordChangeProcessor* change_processor = |
| 293 new PasswordChangeProcessor(model_associator, | 294 new PasswordChangeProcessor(model_associator, |
| 294 password_store, | 295 password_store, |
| 295 error_handler); | 296 error_handler); |
| 296 return SyncComponents(model_associator, change_processor); | 297 return SyncComponents(model_associator, change_processor); |
| 297 } | 298 } |
| 298 | 299 |
| 299 #if defined(ENABLE_THEMES) | 300 #if defined(ENABLE_THEMES) |
| 300 ProfileSyncComponentsFactory::SyncComponents | 301 ProfileSyncComponentsFactory::SyncComponents |
| 301 ProfileSyncComponentsFactoryImpl::CreateThemeSyncComponents( | 302 ProfileSyncComponentsFactoryImpl::CreateThemeSyncComponents( |
| 302 ProfileSyncService* profile_sync_service, | 303 ProfileSyncService* profile_sync_service, |
| 303 DataTypeErrorHandler* error_handler) { | 304 DataTypeErrorHandler* error_handler) { |
| 304 ThemeModelAssociator* model_associator = | 305 ThemeModelAssociator* model_associator = |
| 305 new ThemeModelAssociator(profile_sync_service); | 306 new ThemeModelAssociator(profile_sync_service, error_handler); |
| 306 ThemeChangeProcessor* change_processor = | 307 ThemeChangeProcessor* change_processor = |
| 307 new ThemeChangeProcessor(error_handler); | 308 new ThemeChangeProcessor(error_handler); |
| 308 return SyncComponents(model_associator, change_processor); | 309 return SyncComponents(model_associator, change_processor); |
| 309 } | 310 } |
| 310 #endif | 311 #endif |
| 311 | 312 |
| 312 ProfileSyncComponentsFactory::SyncComponents | 313 ProfileSyncComponentsFactory::SyncComponents |
| 313 ProfileSyncComponentsFactoryImpl::CreateTypedUrlSyncComponents( | 314 ProfileSyncComponentsFactoryImpl::CreateTypedUrlSyncComponents( |
| 314 ProfileSyncService* profile_sync_service, | 315 ProfileSyncService* profile_sync_service, |
| 315 history::HistoryBackend* history_backend, | 316 history::HistoryBackend* history_backend, |
| 316 browser_sync::DataTypeErrorHandler* error_handler) { | 317 browser_sync::DataTypeErrorHandler* error_handler) { |
| 317 TypedUrlModelAssociator* model_associator = | 318 TypedUrlModelAssociator* model_associator = |
| 318 new TypedUrlModelAssociator(profile_sync_service, | 319 new TypedUrlModelAssociator(profile_sync_service, |
| 319 history_backend); | 320 history_backend, |
| 321 error_handler); |
| 320 TypedUrlChangeProcessor* change_processor = | 322 TypedUrlChangeProcessor* change_processor = |
| 321 new TypedUrlChangeProcessor(profile_, | 323 new TypedUrlChangeProcessor(profile_, |
| 322 model_associator, | 324 model_associator, |
| 323 history_backend, | 325 history_backend, |
| 324 error_handler); | 326 error_handler); |
| 325 return SyncComponents(model_associator, change_processor); | 327 return SyncComponents(model_associator, change_processor); |
| 326 } | 328 } |
| 327 | 329 |
| 328 ProfileSyncComponentsFactory::SyncComponents | 330 ProfileSyncComponentsFactory::SyncComponents |
| 329 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 331 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
| 330 ProfileSyncService* profile_sync_service, | 332 ProfileSyncService* profile_sync_service, |
| 331 DataTypeErrorHandler* error_handler) { | 333 DataTypeErrorHandler* error_handler) { |
| 332 SessionModelAssociator* model_associator = | 334 SessionModelAssociator* model_associator = |
| 333 new SessionModelAssociator(profile_sync_service); | 335 new SessionModelAssociator(profile_sync_service, error_handler); |
| 334 SessionChangeProcessor* change_processor = | 336 SessionChangeProcessor* change_processor = |
| 335 new SessionChangeProcessor(error_handler, model_associator); | 337 new SessionChangeProcessor(error_handler, model_associator); |
| 336 return SyncComponents(model_associator, change_processor); | 338 return SyncComponents(model_associator, change_processor); |
| 337 } | 339 } |
| OLD | NEW |