chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc - Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

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 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix tests Created 6 years, 8 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/ui/views/frame/system_menu_model_builder.cc ('k') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('j') | no next file with comments »
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 2c0732e4fe8460a0f6a43ca4590fcea0f11da689..554839b4114ea43ef47f004a94676d1ea4753729 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

@@ -269,13 +269,13 @@ void ChangePictureOptionsHandler::SendSelectedImage() {

switch (previous_image_index_) {

case User::kExternalImageIndex: {

// User has image from camera/file, record it and add to the image list.

- previous_image_ = user->image();

+ previous_image_ = user->GetImage();

SendOldImage(webui::GetBitmapDataUrl(*previous_image_.bitmap()));

break;

}

case User::kProfileImageIndex: {

// User has his/her Profile image as the current image.

- SendProfileImage(user->image(), true);

+ SendProfileImage(user->GetImage(), true);

break;

}

default: {