chrome/browser/sync/profile_sync_factory_impl.cc - Issue 6995008: Implement new SyncAPI and convert Preferences to it.

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 6995008: Implement new SyncAPI and convert Preferences to it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase and fix compile Created 9 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/glue/syncable_service_adapter.cc ('k') | chrome/browser/sync/profile_sync_service_preference_unittest.cc » ('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 9ca4ede5ba9b484fe4d4b34477e1e99c153ef15d..e2c64695488f21b4b31ce4c532bcf776961570f5 100644

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

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

@@ -5,6 +5,7 @@

#include "base/command_line.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/browser/sync/api/syncable_service.h"

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

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

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

@@ -30,6 +31,7 @@

#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"

+#include "chrome/browser/sync/glue/syncable_service_adapter.h"

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

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

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

@@ -39,7 +41,6 @@

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

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/browser/sync/profile_sync_factory_impl.h"

-#include "chrome/browser/sync/syncable_service.h"

#include "chrome/browser/webdata/web_data_service.h"

#include "chrome/common/chrome_switches.h"

@@ -274,9 +275,14 @@ ProfileSyncFactoryImpl::CreatePreferenceSyncComponents(

UnrecoverableErrorHandler* error_handler) {

SyncableService* pref_sync_service =

profile_->GetPrefs()->GetSyncableService();

+ sync_api::UserShare* user_share = profile_sync_service->GetUserShare();

GenericChangeProcessor* change_processor =

- new GenericChangeProcessor(pref_sync_service, error_handler);

- return SyncComponents(pref_sync_service, change_processor);

+ new GenericChangeProcessor(pref_sync_service, error_handler, user_share);

+ browser_sync::SyncableServiceAdapter* sync_service_adapter =

+ new browser_sync::SyncableServiceAdapter(syncable::PREFERENCES,

+ pref_sync_service,

+ change_processor);

+ return SyncComponents(sync_service_adapter, change_processor);

}

ProfileSyncFactory::SyncComponents