Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2289)

Unified Diff: chrome/browser/sync/profile_sync_components_factory_impl.cc

Issue 367153005: Sync: Refactoring of DEVICE_INFO syncable type - Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed ExtensionSessionsTest test failures Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 1b927ae07a776ce24932765e20d8cb65ad33190d..97db80c6e41bd7cb8d85e7271e63420f1e4b335c 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"
@@ -250,7 +251,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.
@@ -467,6 +472,11 @@ ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost(
sync_prefs, sync_folder);
}
+browser_sync::LocalDeviceInfoProvider*
+ProfileSyncComponentsFactoryImpl::CreateLocalDeviceInfoProvider() {
+ return new browser_sync::LocalDeviceInfoProviderImpl();
+}
+
base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl::
GetSyncableServiceForType(syncer::ModelType type) {
if (!profile_) { // For tests.

Powered by Google App Engine
This is Rietveld 408576698