diff options
Diffstat (limited to 'chrome/browser/sync/profile_sync_components_factory_impl.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_components_factory_impl.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc index 8cc64a3..c26ee51 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc @@ -27,6 +27,7 @@ #include "chrome/browser/sync/glue/extension_backed_data_type_controller.h" #include "chrome/browser/sync/glue/extension_data_type_controller.h" #include "chrome/browser/sync/glue/extension_setting_data_type_controller.h" +#include "chrome/browser/sync/glue/local_device_info_provider_impl.h" #include "chrome/browser/sync/glue/password_data_type_controller.h" #include "chrome/browser/sync/glue/search_engine_data_type_controller.h" #include "chrome/browser/sync/glue/sync_backend_host.h" @@ -252,7 +253,11 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes( syncer::PROXY_TABS)); pss->RegisterDataTypeController( new SessionDataTypeController( - this, profile_, MakeDisableCallbackFor(syncer::SESSIONS))); + this, + profile_, + pss->GetSyncedWindowDelegatesGetter(), + pss->GetLocalDeviceInfoProvider(), + MakeDisableCallbackFor(syncer::SESSIONS))); } // Favicon sync is enabled by default. Register unless explicitly disabled. @@ -469,6 +474,12 @@ ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost( sync_prefs, sync_folder); } +scoped_ptr<browser_sync::LocalDeviceInfoProvider> +ProfileSyncComponentsFactoryImpl::CreateLocalDeviceInfoProvider() { + return scoped_ptr<browser_sync::LocalDeviceInfoProvider>( + new browser_sync::LocalDeviceInfoProviderImpl()); +} + base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl:: GetSyncableServiceForType(syncer::ModelType type) { if (!profile_) { // For tests. |