chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc - Issue 376193002: Move UserImage to user_manager

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/managed/locally_managed_user_creation_screen.cc

Issue 376193002: Move UserImage to user_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: bring back gfx::ImageSkia Created 6 years, 5 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/extensions/wallpaper_private_api.cc ('k') | chrome/browser/chromeos/login/screens/user_image_screen.cc » ('j') | chrome/browser/chromeos/login/users/avatar/mock_user_image_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

index dab0a79ab259d2ecaecf5f3351f99b222569c9ae..870f61bd8f574316a404dcba6dec8bd8cf75b57c 100644

--- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

+++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

@@ -19,7 +19,6 @@

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

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

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

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

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

#include "chrome/browser/chromeos/login/users/supervised_user_manager.h"

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

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

#include "chrome/browser/supervised_user/supervised_user_sync_service.h"

#include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"

#include "chromeos/network/network_state.h"

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

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

#include "grit/generated_resources.h"

#include "third_party/skia/include/core/SkBitmap.h"

@@ -460,7 +460,8 @@ void LocallyManagedUserCreationScreen::ApplyPicture() {

apply_photo_after_decoding_ = true;

return;

}

- image_manager->SaveUserImage(UserImage::CreateAndEncode(user_photo_));

+ image_manager->SaveUserImage(

+ user_manager::UserImage::CreateAndEncode(user_photo_));

break;

case User::kProfileImageIndex:

NOTREACHED() << "Supervised users have no profile pictures";