chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.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/ui/webui/options/chromeos/change_picture_options_handler.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

« chrome/browser/chromeos/login/users/avatar/mock_user_image_manager.h ('K') | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | components/user_manager.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

index 4ec5354fd385a569b4c8e2c800a92bb9309767b7..b4d99019b3877ef5fc31751025c38573c8a33b2a 100644

--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

@@ -16,7 +16,6 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/camera_presence_notifier.h"

#include "chrome/browser/chromeos/login/users/avatar/default_user_images.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/user_manager.h"

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

@@ -27,6 +26,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/url_constants.h"

#include "chromeos/audio/chromeos_sounds.h"

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

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

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

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

@@ -345,7 +345,7 @@ void ChangePictureOptionsHandler::HandleSelectImage(

// Previous image (from camera or manually uploaded) re-selected.

DCHECK(!previous_image_.isNull());

user_image_manager->SaveUserImage(

- UserImage::CreateAndEncode(previous_image_));

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

UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",

kHistogramImageOld,

@@ -407,8 +407,8 @@ void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path,

void ChangePictureOptionsHandler::SetImageFromCamera(

const gfx::ImageSkia& photo) {

UserManager* user_manager = UserManager::Get();

- user_manager->GetUserImageManager(GetUser()->email())->SaveUserImage(

- UserImage::CreateAndEncode(photo));

+ user_manager->GetUserImageManager(GetUser()->email())

+ ->SaveUserImage(user_manager::UserImage::CreateAndEncode(photo));

UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",

kHistogramImageFromCamera,

kHistogramImagesCount);