chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 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:

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 e662a3db651bd7aea44babd2ba9c5124a4336110..9c39a455dd9b6f563f04aa7a3676958cb7ee6940 100644

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

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

@@ -13,7 +13,7 @@

#include "chrome/browser/history/history_service.h"

#include "chrome/browser/history/history_service_factory.h"

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

-#include "chrome/browser/prefs/pref_service.h"

+#include "chrome/browser/prefs/pref_service_syncable.h"

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

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

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

@@ -285,7 +285,8 @@ base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl::

}

switch (type) {

case syncer::PREFERENCES:

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

+ return PrefServiceSyncable::FromProfile(

+ profile_)->GetSyncableService()->AsWeakPtr();

case syncer::AUTOFILL:

case syncer::AUTOFILL_PROFILE: {

if (!web_data_service_.get())