| 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/bookmarks/bookmark_model_factory.h" | 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 8 #include "chrome/browser/extensions/api/storage/settings_frontend.h" | 8 #include "chrome/browser/extensions/api/storage/settings_frontend.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/extension_system.h" | 10 #include "chrome/browser/extensions/extension_system.h" |
| (...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 } | 340 } |
| 341 switch (type) { | 341 switch (type) { |
| 342 case syncer::PREFERENCES: | 342 case syncer::PREFERENCES: |
| 343 return PrefServiceSyncable::FromProfile( | 343 return PrefServiceSyncable::FromProfile( |
| 344 profile_)->GetSyncableService(syncer::PREFERENCES)->AsWeakPtr(); | 344 profile_)->GetSyncableService(syncer::PREFERENCES)->AsWeakPtr(); |
| 345 case syncer::PRIORITY_PREFERENCES: | 345 case syncer::PRIORITY_PREFERENCES: |
| 346 return PrefServiceSyncable::FromProfile(profile_)->GetSyncableService( | 346 return PrefServiceSyncable::FromProfile(profile_)->GetSyncableService( |
| 347 syncer::PRIORITY_PREFERENCES)->AsWeakPtr(); | 347 syncer::PRIORITY_PREFERENCES)->AsWeakPtr(); |
| 348 case syncer::AUTOFILL: | 348 case syncer::AUTOFILL: |
| 349 case syncer::AUTOFILL_PROFILE: { | 349 case syncer::AUTOFILL_PROFILE: { |
| 350 if (!web_data_service_.get()) | 350 if (!web_data_service_) |
| 351 return base::WeakPtr<syncer::SyncableService>(); | 351 return base::WeakPtr<syncer::SyncableService>(); |
| 352 if (type == syncer::AUTOFILL) { | 352 if (type == syncer::AUTOFILL) { |
| 353 return AutocompleteSyncableService::FromWebDataService( | 353 return AutocompleteSyncableService::FromWebDataService( |
| 354 web_data_service_.get())->AsWeakPtr(); | 354 web_data_service_)->AsWeakPtr(); |
| 355 } else { | 355 } else { |
| 356 return AutofillProfileSyncableService::FromWebDataService( | 356 return AutofillProfileSyncableService::FromWebDataService( |
| 357 web_data_service_.get())->AsWeakPtr(); | 357 web_data_service_)->AsWeakPtr(); |
| 358 } | 358 } |
| 359 } | 359 } |
| 360 case syncer::APPS: | 360 case syncer::APPS: |
| 361 case syncer::EXTENSIONS: | 361 case syncer::EXTENSIONS: |
| 362 return extension_system_->extension_service()->AsWeakPtr(); | 362 return extension_system_->extension_service()->AsWeakPtr(); |
| 363 case syncer::SEARCH_ENGINES: | 363 case syncer::SEARCH_ENGINES: |
| 364 return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr(); | 364 return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr(); |
| 365 case syncer::APP_SETTINGS: | 365 case syncer::APP_SETTINGS: |
| 366 case syncer::EXTENSION_SETTINGS: | 366 case syncer::EXTENSION_SETTINGS: |
| 367 return extension_system_->extension_service()->settings_frontend()-> | 367 return extension_system_->extension_service()->settings_frontend()-> |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 ProfileSyncComponentsFactory::SyncComponents | 474 ProfileSyncComponentsFactory::SyncComponents |
| 475 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 475 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
| 476 ProfileSyncService* profile_sync_service, | 476 ProfileSyncService* profile_sync_service, |
| 477 DataTypeErrorHandler* error_handler) { | 477 DataTypeErrorHandler* error_handler) { |
| 478 SessionModelAssociator* model_associator = | 478 SessionModelAssociator* model_associator = |
| 479 new SessionModelAssociator(profile_sync_service, error_handler); | 479 new SessionModelAssociator(profile_sync_service, error_handler); |
| 480 SessionChangeProcessor* change_processor = | 480 SessionChangeProcessor* change_processor = |
| 481 new SessionChangeProcessor(error_handler, model_associator); | 481 new SessionChangeProcessor(error_handler, model_associator); |
| 482 return SyncComponents(model_associator, change_processor); | 482 return SyncComponents(model_associator, change_processor); |
| 483 } | 483 } |
| OLD | NEW |