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

Unified Diff: chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc

Issue 1794323003: Make user_manager::UserImage non-copyable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: just rebase Created 4 years, 8 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/fake_chrome_user_manager.cc
diff --git a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
index 7e79232fc87961c690c6afb18697fe9e65e6dbbd..54f80e5366146fab35b47c41e9f7b8f8c2aa876b 100644
--- a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
+++ b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
@@ -48,9 +48,9 @@ const user_manager::User* FakeChromeUserManager::AddUserWithAffiliation(
user->SetAffiliation(is_affiliated);
user->set_username_hash(ProfileHelper::GetUserIdHashByUserIdForTesting(
account_id.GetUserEmail()));
- user->SetStubImage(user_manager::UserImage(
+ user->SetStubImage(make_scoped_ptr(new user_manager::UserImage(
*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_PROFILE_PICTURE_LOADING)),
+ IDR_PROFILE_PICTURE_LOADING))),
user_manager::User::USER_IMAGE_PROFILE, false);
users_.push_back(user);
chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
@@ -63,9 +63,9 @@ const user_manager::User* FakeChromeUserManager::AddPublicAccountUser(
user_manager::User::CreatePublicAccountUser(account_id);
user->set_username_hash(ProfileHelper::GetUserIdHashByUserIdForTesting(
account_id.GetUserEmail()));
- user->SetStubImage(user_manager::UserImage(
+ user->SetStubImage(make_scoped_ptr(new user_manager::UserImage(
*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_PROFILE_PICTURE_LOADING)),
+ IDR_PROFILE_PICTURE_LOADING))),
user_manager::User::USER_IMAGE_PROFILE, false);
users_.push_back(user);
return user;

Powered by Google App Engine
This is Rietveld 408576698