| 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..66b0784ac3269cb5acc3b9f75a16db8bbcd6b118 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
|
| @@ -306,7 +306,7 @@ void ChangePictureOptionsHandler::SendProfileImage(const gfx::ImageSkia& image,
|
|
|
| void ChangePictureOptionsHandler::UpdateProfileImage() {
|
| UserImageManager* user_image_manager =
|
| - UserManager::Get()->GetUserImageManager(GetUser()->email());
|
| + GetUserManager()->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::kProfileImageIndex &&
|
| @@ -337,7 +337,7 @@ void ChangePictureOptionsHandler::HandleSelectImage(
|
| DCHECK(!image_type.empty());
|
|
|
| UserImageManager* user_image_manager =
|
| - UserManager::Get()->GetUserImageManager(GetUser()->email());
|
| + GetUserManager()->GetUserImageManager(GetUser()->email());
|
| int image_index = User::kInvalidImageIndex;
|
| bool waiting_for_camera_photo = false;
|
|
|
| @@ -396,7 +396,7 @@ void ChangePictureOptionsHandler::HandleSelectImage(
|
| void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path,
|
| int index,
|
| void* params) {
|
| - UserManager* user_manager = UserManager::Get();
|
| + UserManager* user_manager = GetUserManager();
|
| user_manager->GetUserImageManager(GetUser()->email())->
|
| SaveUserImageFromFile(path);
|
| UMA_HISTOGRAM_ENUMERATION(
|
| @@ -406,7 +406,7 @@ void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path,
|
|
|
| void ChangePictureOptionsHandler::SetImageFromCamera(
|
| const gfx::ImageSkia& photo) {
|
| - UserManager* user_manager = UserManager::Get();
|
| + UserManager* user_manager = GetUserManager();
|
| user_manager->GetUserImageManager(GetUser()->email())->SaveUserImage(
|
| UserImage::CreateAndEncode(photo));
|
| UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
|
| @@ -467,7 +467,7 @@ User* ChangePictureOptionsHandler::GetUser() const {
|
| Profile* profile = Profile::FromWebUI(web_ui());
|
| User* user = ProfileHelper::Get()->GetUserByProfile(profile);
|
| if (!user)
|
| - return UserManager::Get()->GetActiveUser();
|
| + return GetUserManager()->GetActiveUser();
|
| return user;
|
| }
|
|
|
|
|