chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

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 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Created 5 years, 2 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/webui/options/chromeos/accounts_options_handler.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 1ceeaa79b6a60b07979561a199ce29db17288cd9..b6de55d1750d51808958ee0b7782aecfd3559d9f 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

@@ -305,7 +305,7 @@

void ChangePictureOptionsHandler::UpdateProfileImage() {

UserImageManager* user_image_manager =

- ChromeUserManager::Get()->GetUserImageManager(GetUser()->GetAccountId());

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

// If we have a downloaded profile image and haven't sent it in

// |SendSelectedImage|, send it now (without selecting).

if (previous_image_index_ != user_manager::User::USER_IMAGE_PROFILE &&

@@ -336,7 +336,7 @@

DCHECK(!image_type.empty());

UserImageManager* user_image_manager =

- ChromeUserManager::Get()->GetUserImageManager(GetUser()->GetAccountId());

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

int image_index = user_manager::User::USER_IMAGE_INVALID;

bool waiting_for_camera_photo = false;

@@ -396,7 +396,7 @@

int index,

void* params) {

ChromeUserManager::Get()

- ->GetUserImageManager(GetUser()->GetAccountId())

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

->SaveUserImageFromFile(path);

UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",

user_manager::kHistogramImageFromFile,

@@ -407,7 +407,7 @@

void ChangePictureOptionsHandler::SetImageFromCamera(

const gfx::ImageSkia& photo) {

ChromeUserManager::Get()

- ->GetUserImageManager(GetUser()->GetAccountId())

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

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

UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",

user_manager::kHistogramImageFromCamera,