chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 9414020: [Sync] Switch Extension Settings DTC to use ProfilesyncComponentsFactory

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 9414020: [Sync] Switch Extension Settings DTC to use ProfilesyncComponentsFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: DCHECK Created 8 years, 10 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 336519b4ad635806f20b65056d0011b1ced0a031..70dc4cd78eeae13d3438215cbf14e3bd21b34d4f 100644

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

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

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

#include "base/command_line.h"

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

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

-#include "chrome/browser/extensions/settings/settings_backend.h"

+#include "chrome/browser/extensions/settings/settings_frontend.h"

#include "chrome/browser/prefs/pref_model_associator.h"

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

#include "chrome/browser/search_engines/template_url_service.h"

@@ -281,12 +281,13 @@ ProfileSyncComponentsFactory::SyncComponents

ProfileSyncComponentsFactory::SyncComponents

ProfileSyncComponentsFactoryImpl::CreateExtensionOrAppSettingSyncComponents(

syncable::ModelType type,

- SyncableService* settings_service,

ProfileSyncService* profile_sync_service,

DataTypeErrorHandler* error_handler) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));

DCHECK(type == syncable::EXTENSION_SETTINGS ||

type == syncable::APP_SETTINGS);

+ SyncableService* settings_service = profile_->GetExtensionService()->

+ settings_frontend()->GetBackendForSync(type);

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

GenericChangeProcessor* change_processor =

new GenericChangeProcessor(error_handler,