chrome/browser/sync/chrome_sync_client.cc - Issue 1326353002: Remove dependency of PrefSyncableService on Profile.

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/chrome_sync_client.cc

Issue 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator

Patch Set: Fixing ChromeOS and Linux compilation Created 5 years, 3 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/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/chrome_sync_client.cc

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

index d94aa51b9d0d4c9b74eb25d5bbf7a1146bf3148f..434789002147a6eeca7cddd870a61c63ab4e1017 100644

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

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

@@ -10,6 +10,7 @@

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

#include "chrome/browser/password_manager/password_store_factory.h"

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

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

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

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

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

@@ -136,11 +137,13 @@ ChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {

->GetDeviceInfoSyncableService()

->AsWeakPtr();

case syncer::PREFERENCES:

- return PrefServiceSyncable::FromProfile(

- profile_)->GetSyncableService(syncer::PREFERENCES)->AsWeakPtr();

+ return PrefServiceSyncableFromProfile(profile_)

+ ->GetSyncableService(syncer::PREFERENCES)

+ ->AsWeakPtr();

case syncer::PRIORITY_PREFERENCES:

- return PrefServiceSyncable::FromProfile(profile_)->GetSyncableService(

- syncer::PRIORITY_PREFERENCES)->AsWeakPtr();

+ return PrefServiceSyncableFromProfile(profile_)

+ ->GetSyncableService(syncer::PRIORITY_PREFERENCES)

+ ->AsWeakPtr();

case syncer::AUTOFILL:

case syncer::AUTOFILL_PROFILE:

case syncer::AUTOFILL_WALLET_DATA: