chrome/browser/sync/profile_sync_factory_impl.cc - Issue 6905044: Refactor preference syncing.

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_factory_impl.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix the previous fix Created 9 years, 8 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

« chrome/browser/sync/glue/model_associator.h ('K') | « chrome/browser/sync/profile_sync_factory_impl.h ('k') | chrome/browser/sync/profile_sync_factory_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_factory_impl.cc

diff --git a/chrome/browser/sync/profile_sync_factory_impl.cc b/chrome/browser/sync/profile_sync_factory_impl.cc

index 19f493873ca61c183607199b15c42be8c41a48c2..f040ec4826da5d7fbdbebac1cb12bc2f18aa3a6d 100644

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

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

@@ -23,9 +23,7 @@

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

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

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

-#include "chrome/browser/sync/glue/preference_change_processor.h"

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

-#include "chrome/browser/sync/glue/preference_model_associator.h"

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

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

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

@@ -60,9 +58,7 @@ using browser_sync::ExtensionModelAssociator;

using browser_sync::PasswordChangeProcessor;

using browser_sync::PasswordDataTypeController;

using browser_sync::PasswordModelAssociator;

-using browser_sync::PreferenceChangeProcessor;

using browser_sync::PreferenceDataTypeController;

-using browser_sync::PreferenceModelAssociator;

using browser_sync::SessionChangeProcessor;

using browser_sync::SessionDataTypeController;

using browser_sync::SessionModelAssociator;

@@ -269,18 +265,6 @@ ProfileSyncFactoryImpl::CreatePasswordSyncComponents(

}

ProfileSyncFactory::SyncComponents

-ProfileSyncFactoryImpl::CreatePreferenceSyncComponents(

- ProfileSyncService* profile_sync_service,

- UnrecoverableErrorHandler* error_handler) {

- PreferenceModelAssociator* model_associator =

- new PreferenceModelAssociator(profile_sync_service);

- PreferenceChangeProcessor* change_processor =

- new PreferenceChangeProcessor(model_associator,

- error_handler);

- return SyncComponents(model_associator, change_processor);

-ProfileSyncFactory::SyncComponents

ProfileSyncFactoryImpl::CreateThemeSyncComponents(

ProfileSyncService* profile_sync_service,

UnrecoverableErrorHandler* error_handler) {