chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc - Issue 1794323003: Make user_manager::UserImage non-copyable

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/users/chrome_user_manager_impl.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, 9 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

« no previous file with comments | « chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc ('k') | chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b8e52785598de8c194405a0c564705f2c625ac7c..4ecd8c9e778165b45a153164786143725e5d6ea6 100644

--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

@@ -688,11 +688,10 @@ void ChromeUserManagerImpl::GuestUserLoggedIn() {

// mount point. Legacy (--login-profile) value will be used for now.

// http://crosbug.com/230859

active_user_->SetStubImage(

- user_manager::UserImage(

+ make_scoped_ptr(new user_manager::UserImage(

*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

- IDR_PROFILE_PICTURE_LOADING)),

- user_manager::User::USER_IMAGE_INVALID,

- false);

+ IDR_PROFILE_PICTURE_LOADING))),

+ user_manager::User::USER_IMAGE_INVALID, false);

// Initializes wallpaper after active_user_ is set.

WallpaperManager::Get()->SetUserWallpaperNow(login::GuestAccountId());

@@ -798,11 +797,10 @@ void ChromeUserManagerImpl::KioskAppLoggedIn(

active_user_ = user_manager::User::CreateKioskAppUser(kiosk_app_account_id);

active_user_->SetStubImage(

- user_manager::UserImage(

+ make_scoped_ptr(new user_manager::UserImage(

*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

- IDR_PROFILE_PICTURE_LOADING)),

- user_manager::User::USER_IMAGE_INVALID,

- false);

+ IDR_PROFILE_PICTURE_LOADING))),

+ user_manager::User::USER_IMAGE_INVALID, false);

WallpaperManager::Get()->SetUserWallpaperNow(kiosk_app_account_id);

@@ -843,11 +841,10 @@ void ChromeUserManagerImpl::DemoAccountLoggedIn() {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

active_user_ = user_manager::User::CreateKioskAppUser(login::DemoAccountId());

active_user_->SetStubImage(

- user_manager::UserImage(

+ make_scoped_ptr(new user_manager::UserImage(

*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

- IDR_PROFILE_PICTURE_LOADING)),

- user_manager::User::USER_IMAGE_INVALID,

- false);

+ IDR_PROFILE_PICTURE_LOADING))),

+ user_manager::User::USER_IMAGE_INVALID, false);

WallpaperManager::Get()->SetUserWallpaperNow(login::DemoAccountId());

base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();