chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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.h ('k') | chrome/browser/chromeos/login/users/chrome_user_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 bb9268f8db8a676fbdf229a7b1d16836c4bf177a..00523957cf250299419ab62cbf90dcbed60e94d7 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

@@ -10,12 +10,14 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/login/screens/user_image_screen.h"

#include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"

+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"

#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/common/pref_names.h"

#include "components/user_manager/user.h"

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

+#include "components/user_manager/user_manager.h"

#include "content/public/browser/notification_registrar.h"

#include "content/public/browser/notification_service.h"

@@ -168,7 +170,7 @@ void UserImageSyncObserver::UpdateLocalImageFromSynced() {

if ((synced_index == local_index) || !IsIndexSupported(synced_index))

return;

UserImageManager* image_manager =

- UserManager::Get()->GetUserImageManager(user_->email());

+ ChromeUserManager::Get()->GetUserImageManager(user_->email());

if (synced_index == user_manager::User::USER_IMAGE_PROFILE) {

image_manager->SaveUserImageFromProfileImage();

} else {