chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 278053002: Move DataTypeManager into sync_driver component

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 278053002: Move DataTypeManager into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tests Created 6 years, 7 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:

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 4ba88f48f082ee64f7b2c368b161e3b0a1bffcc2..c9f4edb0dd4dd1e06f8e4d69640be8622663c15c 100644

--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc

+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc

@@ -23,7 +23,6 @@

#include "chrome/browser/sync/glue/bookmark_data_type_controller.h"

#include "chrome/browser/sync/glue/bookmark_model_associator.h"

#include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h"

-#include "chrome/browser/sync/glue/data_type_manager_impl.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/password_data_type_controller.h"

@@ -53,6 +52,7 @@

#include "components/dom_distiller/core/dom_distiller_service.h"

#include "components/password_manager/core/browser/password_store.h"

#include "components/signin/core/browser/signin_manager.h"

+#include "components/sync_driver/data_type_manager_impl.h"

#include "components/sync_driver/data_type_manager_observer.h"

#include "components/sync_driver/generic_change_processor.h"

#include "components/sync_driver/proxy_data_type_controller.h"

@@ -421,7 +421,8 @@ DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(

SyncBackendHost* backend,

DataTypeManagerObserver* observer,

browser_sync::FailedDataTypesHandler* failed_data_types_handler) {

- return new DataTypeManagerImpl(debug_info_listener,

+ return new DataTypeManagerImpl(base::Bind(ChromeReportUnrecoverableError),

+ debug_info_listener,

controllers,

encryption_handler,

backend,