| 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/bookmarks/enhanced_bookmarks_features.h" | 8 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
| 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" | 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" |
| 10 #include "chrome/browser/history/history_service.h" | 10 #include "chrome/browser/history/history_service.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 #include "chrome/browser/supervised_user/supervised_user_sync_data_type_controll
er.h" | 88 #include "chrome/browser/supervised_user/supervised_user_sync_data_type_controll
er.h" |
| 89 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" | 89 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" |
| 90 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h" | 90 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h" |
| 91 #endif | 91 #endif |
| 92 | 92 |
| 93 #if defined(ENABLE_SPELLCHECK) | 93 #if defined(ENABLE_SPELLCHECK) |
| 94 #include "chrome/browser/spellchecker/spellcheck_factory.h" | 94 #include "chrome/browser/spellchecker/spellcheck_factory.h" |
| 95 #include "chrome/browser/spellchecker/spellcheck_service.h" | 95 #include "chrome/browser/spellchecker/spellcheck_service.h" |
| 96 #endif | 96 #endif |
| 97 | 97 |
| 98 #if defined(OS_CHROMEOS) |
| 99 #include "components/wifi_sync/wifi_credential_syncable_service.h" |
| 100 #include "components/wifi_sync/wifi_credential_syncable_service_factory.h" |
| 101 #endif |
| 102 |
| 98 using browser_sync::AutofillDataTypeController; | 103 using browser_sync::AutofillDataTypeController; |
| 99 using browser_sync::AutofillProfileDataTypeController; | 104 using browser_sync::AutofillProfileDataTypeController; |
| 100 using browser_sync::BookmarkChangeProcessor; | 105 using browser_sync::BookmarkChangeProcessor; |
| 101 using browser_sync::BookmarkDataTypeController; | 106 using browser_sync::BookmarkDataTypeController; |
| 102 using browser_sync::BookmarkModelAssociator; | 107 using browser_sync::BookmarkModelAssociator; |
| 103 using browser_sync::ChromeReportUnrecoverableError; | 108 using browser_sync::ChromeReportUnrecoverableError; |
| 104 #if defined(ENABLE_EXTENSIONS) | 109 #if defined(ENABLE_EXTENSIONS) |
| 105 using browser_sync::ExtensionBackedDataTypeController; | 110 using browser_sync::ExtensionBackedDataTypeController; |
| 106 using browser_sync::ExtensionDataTypeController; | 111 using browser_sync::ExtensionDataTypeController; |
| 107 using browser_sync::ExtensionSettingDataTypeController; | 112 using browser_sync::ExtensionSettingDataTypeController; |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 new SupervisedUserSyncDataTypeController( | 390 new SupervisedUserSyncDataTypeController( |
| 386 syncer::SUPERVISED_USERS, | 391 syncer::SUPERVISED_USERS, |
| 387 this, | 392 this, |
| 388 profile_)); | 393 profile_)); |
| 389 pss->RegisterDataTypeController( | 394 pss->RegisterDataTypeController( |
| 390 new SupervisedUserSyncDataTypeController( | 395 new SupervisedUserSyncDataTypeController( |
| 391 syncer::SUPERVISED_USER_SHARED_SETTINGS, | 396 syncer::SUPERVISED_USER_SHARED_SETTINGS, |
| 392 this, | 397 this, |
| 393 profile_)); | 398 profile_)); |
| 394 #endif | 399 #endif |
| 400 |
| 401 #if defined(OS_CHROMEOS) |
| 402 if (command_line_->HasSwitch(switches::kEnableWifiCredentialSync) && |
| 403 !disabled_types.Has(syncer::WIFI_CREDENTIALS)) { |
| 404 pss->RegisterDataTypeController( |
| 405 new UIDataTypeController( |
| 406 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |
| 407 base::Bind(&ChromeReportUnrecoverableError), |
| 408 syncer::WIFI_CREDENTIALS, |
| 409 this)); |
| 410 } |
| 411 #endif |
| 395 } | 412 } |
| 396 | 413 |
| 397 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( | 414 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager( |
| 398 const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>& | 415 const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>& |
| 399 debug_info_listener, | 416 debug_info_listener, |
| 400 const DataTypeController::TypeMap* controllers, | 417 const DataTypeController::TypeMap* controllers, |
| 401 const sync_driver::DataTypeEncryptionHandler* encryption_handler, | 418 const sync_driver::DataTypeEncryptionHandler* encryption_handler, |
| 402 SyncBackendHost* backend, | 419 SyncBackendHost* backend, |
| 403 DataTypeManagerObserver* observer) { | 420 DataTypeManagerObserver* observer) { |
| 404 return new DataTypeManagerImpl(base::Bind(ChromeReportUnrecoverableError), | 421 return new DataTypeManagerImpl(base::Bind(ChromeReportUnrecoverableError), |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 #if defined(PASSWORD_MANAGER_ENABLE_SYNC) | 538 #if defined(PASSWORD_MANAGER_ENABLE_SYNC) |
| 522 scoped_refptr<password_manager::PasswordStore> password_store = | 539 scoped_refptr<password_manager::PasswordStore> password_store = |
| 523 PasswordStoreFactory::GetForProfile(profile_, | 540 PasswordStoreFactory::GetForProfile(profile_, |
| 524 Profile::EXPLICIT_ACCESS); | 541 Profile::EXPLICIT_ACCESS); |
| 525 return password_store.get() ? password_store->GetPasswordSyncableService() | 542 return password_store.get() ? password_store->GetPasswordSyncableService() |
| 526 : base::WeakPtr<syncer::SyncableService>(); | 543 : base::WeakPtr<syncer::SyncableService>(); |
| 527 #else | 544 #else |
| 528 return base::WeakPtr<syncer::SyncableService>(); | 545 return base::WeakPtr<syncer::SyncableService>(); |
| 529 #endif | 546 #endif |
| 530 } | 547 } |
| 548 #if defined(OS_CHROMEOS) |
| 549 case syncer::WIFI_CREDENTIALS: |
| 550 return wifi_sync::WifiCredentialSyncableServiceFactory:: |
| 551 GetForBrowserContext(profile_)->AsWeakPtr(); |
| 552 #endif |
| 531 default: | 553 default: |
| 532 // The following datatypes still need to be transitioned to the | 554 // The following datatypes still need to be transitioned to the |
| 533 // syncer::SyncableService API: | 555 // syncer::SyncableService API: |
| 534 // Bookmarks | 556 // Bookmarks |
| 535 // Typed URLs | 557 // Typed URLs |
| 536 NOTREACHED(); | 558 NOTREACHED(); |
| 537 return base::WeakPtr<syncer::SyncableService>(); | 559 return base::WeakPtr<syncer::SyncableService>(); |
| 538 } | 560 } |
| 539 } | 561 } |
| 540 | 562 |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 new TypedUrlModelAssociator(profile_sync_service, | 688 new TypedUrlModelAssociator(profile_sync_service, |
| 667 history_backend, | 689 history_backend, |
| 668 error_handler); | 690 error_handler); |
| 669 TypedUrlChangeProcessor* change_processor = | 691 TypedUrlChangeProcessor* change_processor = |
| 670 new TypedUrlChangeProcessor(profile_, | 692 new TypedUrlChangeProcessor(profile_, |
| 671 model_associator, | 693 model_associator, |
| 672 history_backend, | 694 history_backend, |
| 673 error_handler); | 695 error_handler); |
| 674 return SyncComponents(model_associator, change_processor); | 696 return SyncComponents(model_associator, change_processor); |
| 675 } | 697 } |
| OLD | NEW |