chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.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/login/users/avatar/user_image_sync_observer.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

Index: chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

index 13b2039f6b42fc820ea5ffe47bed24f46ff5f9d9..c36f37b9c024090a263f23ac7cb48cb5b460722c 100644

--- a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

+++ b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/chromeos/login/wizard_controller.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

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

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

#include "chrome/common/pref_names.h"

#include "components/user_manager/user.h"

#include "components/user_manager/user_image/default_user_images.h"

@@ -81,7 +82,7 @@ void UserImageSyncObserver::RemoveObserver(Observer* observer) {

}

void UserImageSyncObserver::OnProfileGained(Profile* profile) {

- prefs_ = PrefServiceSyncable::FromProfile(profile);

+ prefs_ = PrefServiceSyncableFromProfile(profile);

pref_change_registrar_.reset(new PrefChangeRegistrar);

pref_change_registrar_->Init(prefs_);

pref_change_registrar_->Add(kUserImageInfo,

« no previous file with comments | « chrome/browser/chromeos/first_run/first_run.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »