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

Unified Diff: chrome/browser/chromeos/login/users/chrome_user_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/chrome_user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index 590a5828e771e5b8da27993f37e3786ce14be5ab..c2e8e458ff583c942c1ae83661e5ca8bdb328bd7 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -717,9 +717,9 @@ void ChromeUserManagerImpl::GuestUserLoggedIn() {
// mount point. Legacy (--login-profile) value will be used for now.
// http://crosbug.com/230859
active_user_->SetStubImage(
- base::WrapUnique(new user_manager::UserImage(
+ base::MakeUnique<user_manager::UserImage>(
*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_PROFILE_PICTURE_LOADING))),
+ IDR_PROFILE_PICTURE_LOADING)),
user_manager::User::USER_IMAGE_INVALID, false);
// Initializes wallpaper after active_user_ is set.
@@ -820,9 +820,9 @@ void ChromeUserManagerImpl::KioskAppLoggedIn(user_manager::User* user) {
active_user_ = user;
active_user_->SetStubImage(
- base::WrapUnique(new user_manager::UserImage(
+ base::MakeUnique<user_manager::UserImage>(
*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_PROFILE_PICTURE_LOADING))),
+ IDR_PROFILE_PICTURE_LOADING)),
user_manager::User::USER_IMAGE_INVALID, false);
const AccountId& kiosk_app_account_id = user->GetAccountId();
@@ -865,9 +865,9 @@ void ChromeUserManagerImpl::DemoAccountLoggedIn() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
active_user_ = user_manager::User::CreateKioskAppUser(login::DemoAccountId());
active_user_->SetStubImage(
- base::WrapUnique(new user_manager::UserImage(
+ base::MakeUnique<user_manager::UserImage>(
*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_PROFILE_PICTURE_LOADING))),
+ IDR_PROFILE_PICTURE_LOADING)),
user_manager::User::USER_IMAGE_INVALID, false);
WallpaperManager::Get()->SetUserWallpaperNow(login::DemoAccountId());

Powered by Google App Engine
This is Rietveld 408576698