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