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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 } | 330 } |
331 switch (type) { | 331 switch (type) { |
332 case syncer::PREFERENCES: | 332 case syncer::PREFERENCES: |
333 return PrefServiceSyncable::FromProfile( | 333 return PrefServiceSyncable::FromProfile( |
334 profile_)->GetSyncableService(syncer::PREFERENCES)->AsWeakPtr(); | 334 profile_)->GetSyncableService(syncer::PREFERENCES)->AsWeakPtr(); |
335 case syncer::PRIORITY_PREFERENCES: | 335 case syncer::PRIORITY_PREFERENCES: |
336 return PrefServiceSyncable::FromProfile(profile_)->GetSyncableService( | 336 return PrefServiceSyncable::FromProfile(profile_)->GetSyncableService( |
337 syncer::PRIORITY_PREFERENCES)->AsWeakPtr(); | 337 syncer::PRIORITY_PREFERENCES)->AsWeakPtr(); |
338 case syncer::AUTOFILL: | 338 case syncer::AUTOFILL: |
339 case syncer::AUTOFILL_PROFILE: { | 339 case syncer::AUTOFILL_PROFILE: { |
340 if (!web_data_service_) | 340 if (!web_data_service_.get()) |
341 return base::WeakPtr<syncer::SyncableService>(); | 341 return base::WeakPtr<syncer::SyncableService>(); |
342 if (type == syncer::AUTOFILL) { | 342 if (type == syncer::AUTOFILL) { |
343 return AutocompleteSyncableService::FromWebDataService( | 343 return AutocompleteSyncableService::FromWebDataService( |
344 web_data_service_)->AsWeakPtr(); | 344 web_data_service_.get())->AsWeakPtr(); |
345 } else { | 345 } else { |
346 return AutofillProfileSyncableService::FromWebDataService( | 346 return AutofillProfileSyncableService::FromWebDataService( |
347 web_data_service_)->AsWeakPtr(); | 347 web_data_service_.get())->AsWeakPtr(); |
348 } | 348 } |
349 } | 349 } |
350 case syncer::APPS: | 350 case syncer::APPS: |
351 case syncer::EXTENSIONS: | 351 case syncer::EXTENSIONS: |
352 return extension_system_->extension_service()->AsWeakPtr(); | 352 return extension_system_->extension_service()->AsWeakPtr(); |
353 case syncer::SEARCH_ENGINES: | 353 case syncer::SEARCH_ENGINES: |
354 return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr(); | 354 return TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr(); |
355 case syncer::APP_SETTINGS: | 355 case syncer::APP_SETTINGS: |
356 case syncer::EXTENSION_SETTINGS: | 356 case syncer::EXTENSION_SETTINGS: |
357 return extension_system_->extension_service()->settings_frontend()-> | 357 return extension_system_->extension_service()->settings_frontend()-> |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
461 ProfileSyncComponentsFactory::SyncComponents | 461 ProfileSyncComponentsFactory::SyncComponents |
462 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( | 462 ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents( |
463 ProfileSyncService* profile_sync_service, | 463 ProfileSyncService* profile_sync_service, |
464 DataTypeErrorHandler* error_handler) { | 464 DataTypeErrorHandler* error_handler) { |
465 SessionModelAssociator* model_associator = | 465 SessionModelAssociator* model_associator = |
466 new SessionModelAssociator(profile_sync_service, error_handler); | 466 new SessionModelAssociator(profile_sync_service, error_handler); |
467 SessionChangeProcessor* change_processor = | 467 SessionChangeProcessor* change_processor = |
468 new SessionChangeProcessor(error_handler, model_associator); | 468 new SessionChangeProcessor(error_handler, model_associator); |
469 return SyncComponents(model_associator, change_processor); | 469 return SyncComponents(model_associator, change_processor); |
470 } | 470 } |
OLD | NEW |