chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

Unified Diff: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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/profiles/profile_window.cc ('K') | « chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('j') | components/user_manager/user_id.h » ('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 b6de55d1750d51808958ee0b7782aecfd3559d9f..4da90319501fe5c59e5ba5f461d628d88ba7f5bb 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

@@ -262,7 +262,7 @@ void ChangePictureOptionsHandler::HandlePageHidden(

void ChangePictureOptionsHandler::SendSelectedImage() {

const user_manager::User* user = GetUser();

- DCHECK(!user->email().empty());

+ DCHECK(!user->GetUserID().empty());

previous_image_index_ = user->image_index();

switch (previous_image_index_) {

@@ -305,7 +305,7 @@ void ChangePictureOptionsHandler::SendProfileImage(const gfx::ImageSkia& image,

void ChangePictureOptionsHandler::UpdateProfileImage() {

UserImageManager* user_image_manager =

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

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

// 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 @@ void ChangePictureOptionsHandler::HandleSelectImage(

DCHECK(!image_type.empty());

UserImageManager* user_image_manager =

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

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

int image_index = user_manager::User::USER_IMAGE_INVALID;

bool waiting_for_camera_photo = false;

@@ -396,7 +396,7 @@ void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path,

int index,

void* params) {

ChromeUserManager::Get()

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

+ ->GetUserImageManager(GetUser()->GetUserID())

->SaveUserImageFromFile(path);

UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",

user_manager::kHistogramImageFromFile,

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

void ChangePictureOptionsHandler::SetImageFromCamera(

const gfx::ImageSkia& photo) {

ChromeUserManager::Get()

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

+ ->GetUserImageManager(GetUser()->GetUserID())

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

UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",

user_manager::kHistogramImageFromCamera,