trunk/src/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc - Issue 408833004: Revert 284417 "Move default user profile images strings and reso..."

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: trunk/src/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

Issue 408833004: Revert 284417 "Move default user profile images strings and reso..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 5 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 | « trunk/src/chrome/browser/chromeos/login/screens/user_image_screen.cc ('k') | trunk/src/chrome/browser/chromeos/login/users/avatar/default_user_images.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

===================================================================

--- trunk/src/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc (revision 284418)

+++ trunk/src/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc (working copy)

@@ -458,8 +458,7 @@

NOTREACHED() << "Supervised users have no profile pictures";

break;

default:

- DCHECK(selected_image_ >= 0 &&

- selected_image_ < user_manager::kDefaultImagesCount);

+ DCHECK(selected_image_ >= 0 && selected_image_ < kDefaultImagesCount);

image_manager->SaveUserDefaultImageIndex(selected_image_);

break;

}

@@ -503,16 +502,14 @@

!chromeos_avatar.empty() &&

SupervisedUserSyncService::GetAvatarIndex(

chromeos_avatar, &avatar_index)) {

- ui_copy->SetString(kAvatarURLKey,

- user_manager::GetDefaultImageUrl(avatar_index));

+ ui_copy->SetString(kAvatarURLKey, GetDefaultImageUrl(avatar_index));

} else {

- int i = base::RandInt(user_manager::kFirstDefaultImageIndex,

- user_manager::kDefaultImagesCount - 1);

+ int i = base::RandInt(kFirstDefaultImageIndex, kDefaultImagesCount - 1);

local_copy->SetString(

SupervisedUserSyncService::kChromeOsAvatar,

SupervisedUserSyncService::BuildAvatarString(i));

local_copy->SetBoolean(kRandomAvatarKey, true);

- ui_copy->SetString(kAvatarURLKey, user_manager::GetDefaultImageUrl(i));

+ ui_copy->SetString(kAvatarURLKey, GetDefaultImageUrl(i));

}

local_copy->SetBoolean(kUserExists, false);

@@ -584,7 +581,7 @@

return;

int user_image_index = User::kInvalidImageIndex;

if (image_type == "default" &&

- user_manager::IsDefaultImageUrl(image_url, &user_image_index)) {

+ IsDefaultImageUrl(image_url, &user_image_index)) {

selected_image_ = user_image_index;

} else if (image_type == "camera") {

selected_image_ = User::kExternalImageIndex;