chrome/browser/chromeos/preferences.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/chromeos/preferences.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/chromeos/login/users/avatar/user_image_sync_observer.cc ('k') | chrome/browser/extensions/external_pref_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/preferences.cc

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc

index 602239a1ffe3f05088aecdf8f70fc4176b46820d..c601805c8a9c07a3e91a000e5998a9caa04ed3c3 100644

--- a/chrome/browser/chromeos/preferences.cc

+++ b/chrome/browser/chromeos/preferences.cc

@@ -28,6 +28,7 @@

#include "chrome/browser/chromeos/system/input_device_settings.h"

#include "chrome/browser/download/download_prefs.h"

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

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chromeos/chromeos_switches.h"

@@ -325,7 +326,7 @@ void Preferences::InitUserPrefs(PrefServiceSyncable* prefs) {

void Preferences::Init(Profile* profile, const user_manager::User* user) {

DCHECK(profile);

DCHECK(user);

- PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile);

+ PrefServiceSyncable* prefs = PrefServiceSyncableFromProfile(profile);

// This causes OnIsSyncingChanged to be called when the value of

// PrefService::IsSyncing() changes.

prefs->AddObserver(this);