Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(573)

Unified Diff: chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc

Issue 2257103002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
index 360e5bb8e5316fd56e1c303bd20f601135777e5f..6c1be1497b17c275ee529dfeb900a087786dedf7 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
@@ -409,9 +409,9 @@ void UserImageManagerImpl::Job::UpdateUser(
user->SetImage(std::move(user_image), image_index_);
} else {
user->SetStubImage(
- base::WrapUnique(new user_manager::UserImage(
+ base::MakeUnique<user_manager::UserImage>(
*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_PROFILE_PICTURE_LOADING))),
+ IDR_PROFILE_PICTURE_LOADING)),
image_index_, false);
}
user->SetImageURL(image_url_);
@@ -542,8 +542,8 @@ void UserImageManagerImpl::LoadUserImage() {
image_properties->GetInteger(kImageIndexNodeName, &image_index);
if (image_index >= 0 &&
image_index < default_user_image::kDefaultImagesCount) {
- user->SetImage(base::WrapUnique(new user_manager::UserImage(
- default_user_image::GetDefaultImage(image_index))),
+ user->SetImage(base::MakeUnique<user_manager::UserImage>(
+ default_user_image::GetDefaultImage(image_index)),
image_index);
return;
}
@@ -561,9 +561,9 @@ void UserImageManagerImpl::LoadUserImage() {
image_properties->GetString(kImagePathNodeName, &image_path);
user->SetImageURL(image_url);
- user->SetStubImage(base::WrapUnique(new user_manager::UserImage(
+ user->SetStubImage(base::MakeUnique<user_manager::UserImage>(
*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_PROFILE_PICTURE_LOADING))),
+ IDR_PROFILE_PICTURE_LOADING)),
image_index, true);
DCHECK(!image_path.empty() ||
image_index == user_manager::User::USER_IMAGE_PROFILE);

Powered by Google App Engine
This is Rietveld 408576698