| 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 "chrome/browser/extensions/app_notification_manager.h" | 6 #include "chrome/browser/extensions/app_notification_manager.h" |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/extensions/settings/settings_backend.h" | 8 #include "chrome/browser/extensions/settings/settings_frontend.h" |
| 9 #include "chrome/browser/prefs/pref_model_associator.h" | 9 #include "chrome/browser/prefs/pref_model_associator.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/search_engines/template_url_service.h" | 11 #include "chrome/browser/search_engines/template_url_service.h" |
| 12 #include "chrome/browser/search_engines/template_url_service_factory.h" | 12 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 13 #include "chrome/browser/signin/signin_manager.h" | 13 #include "chrome/browser/signin/signin_manager.h" |
| 14 #include "chrome/browser/signin/signin_manager_factory.h" | 14 #include "chrome/browser/signin/signin_manager_factory.h" |
| 15 #include "chrome/browser/sync/api/syncable_service.h" | 15 #include "chrome/browser/sync/api/syncable_service.h" |
| 16 #include "chrome/browser/sync/glue/app_data_type_controller.h" | 16 #include "chrome/browser/sync/glue/app_data_type_controller.h" |
| 17 #include "chrome/browser/sync/glue/app_notification_data_type_controller.h" | 17 #include "chrome/browser/sync/glue/app_notification_data_type_controller.h" |
| 18 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" | 18 #include "chrome/browser/sync/glue/autofill_data_type_controller.h" |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 error_handler); | 274 error_handler); |
| 275 BookmarkChangeProcessor* change_processor = | 275 BookmarkChangeProcessor* change_processor = |
| 276 new BookmarkChangeProcessor(model_associator, | 276 new BookmarkChangeProcessor(model_associator, |
| 277 error_handler); | 277 error_handler); |
| 278 return SyncComponents(model_associator, change_processor); | 278 return SyncComponents(model_associator, change_processor); |
| 279 } | 279 } |
| 280 | 280 |
| 281 ProfileSyncComponentsFactory::SyncComponents | 281 ProfileSyncComponentsFactory::SyncComponents |
| 282 ProfileSyncComponentsFactoryImpl::CreateExtensionOrAppSettingSyncComponents( | 282 ProfileSyncComponentsFactoryImpl::CreateExtensionOrAppSettingSyncComponents( |
| 283 syncable::ModelType type, | 283 syncable::ModelType type, |
| 284 SyncableService* settings_service, | |
| 285 ProfileSyncService* profile_sync_service, | 284 ProfileSyncService* profile_sync_service, |
| 286 DataTypeErrorHandler* error_handler) { | 285 DataTypeErrorHandler* error_handler) { |
| 287 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); | 286 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
| 288 DCHECK(type == syncable::EXTENSION_SETTINGS || | 287 DCHECK(type == syncable::EXTENSION_SETTINGS || |
| 289 type == syncable::APP_SETTINGS); | 288 type == syncable::APP_SETTINGS); |
| 289 SyncableService* settings_service = profile_->GetExtensionService()-> |
| 290 settings_frontend()->GetBackendForSync(type); |
| 290 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); | 291 sync_api::UserShare* user_share = profile_sync_service->GetUserShare(); |
| 291 GenericChangeProcessor* change_processor = | 292 GenericChangeProcessor* change_processor = |
| 292 new GenericChangeProcessor(error_handler, | 293 new GenericChangeProcessor(error_handler, |
| 293 settings_service->AsWeakPtr(), | 294 settings_service->AsWeakPtr(), |
| 294 user_share); | 295 user_share); |
| 295 browser_sync::SyncableServiceAdapter* sync_service_adapter = | 296 browser_sync::SyncableServiceAdapter* sync_service_adapter = |
| 296 new browser_sync::SyncableServiceAdapter(type, | 297 new browser_sync::SyncableServiceAdapter(type, |
| 297 settings_service, | 298 settings_service, |
| 298 change_processor); | 299 change_processor); |
| 299 return SyncComponents(sync_service_adapter, change_processor); | 300 return SyncComponents(sync_service_adapter, change_processor); |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 GenericChangeProcessor* change_processor = | 419 GenericChangeProcessor* change_processor = |
| 419 new GenericChangeProcessor(error_handler, | 420 new GenericChangeProcessor(error_handler, |
| 420 notif_sync_service, | 421 notif_sync_service, |
| 421 user_share); | 422 user_share); |
| 422 SyncableServiceAdapter* sync_service_adapter = | 423 SyncableServiceAdapter* sync_service_adapter = |
| 423 new SyncableServiceAdapter(syncable::APP_NOTIFICATIONS, | 424 new SyncableServiceAdapter(syncable::APP_NOTIFICATIONS, |
| 424 notif_sync_service, | 425 notif_sync_service, |
| 425 change_processor); | 426 change_processor); |
| 426 return SyncComponents(sync_service_adapter, change_processor); | 427 return SyncComponents(sync_service_adapter, change_processor); |
| 427 } | 428 } |
| OLD | NEW |