chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 10834351: [sync] Divorce DataTypeManager from NotificationService notifications by creating a new DataTypeMa…

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 10834351: [sync] Divorce DataTypeManager from NotificationService notifications by creating a new DataTypeMa… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Restore expectations in DTMImpl unittest + Treat observer_ as const Created 8 years, 4 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

« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.h ('k') | chrome/browser/sync/profile_sync_components_factory_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 92d0eaa8909cbe12fb85b426e31a4b9b454e4682..5962ab81e8a6d39921f427ed2b84b32a0fd459d3 100644

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

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

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

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

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

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

+#include "chrome/browser/sync/glue/data_type_manager_observer.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/generic_change_processor.h"

@@ -62,6 +63,7 @@ using browser_sync::BookmarkModelAssociator;

using browser_sync::DataTypeController;

using browser_sync::DataTypeManager;

using browser_sync::DataTypeManagerImpl;

+using browser_sync::DataTypeManagerObserver;

using browser_sync::ExtensionDataTypeController;

using browser_sync::ExtensionSettingDataTypeController;

using browser_sync::GenericChangeProcessor;

@@ -213,8 +215,9 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(

DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(

SyncBackendHost* backend,

- const DataTypeController::TypeMap* controllers) {

- return new DataTypeManagerImpl(backend, controllers);

+ const DataTypeController::TypeMap* controllers,

+ DataTypeManagerObserver* observer) {

+ return new DataTypeManagerImpl(backend, controllers, observer);

}

browser_sync::GenericChangeProcessor*