trunk/src/chrome/browser/supervised_user/supervised_user_sync_service.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/supervised_user/supervised_user_sync_service.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:

Index: trunk/src/chrome/browser/supervised_user/supervised_user_sync_service.cc

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

--- trunk/src/chrome/browser/supervised_user/supervised_user_sync_service.cc (revision 284418)

+++ trunk/src/chrome/browser/supervised_user/supervised_user_sync_service.cc (working copy)

@@ -21,7 +21,7 @@

#include "sync/protocol/sync.pb.h"

#if defined(OS_CHROMEOS)

-#include "components/user_manager/user_image/default_user_images.h"

+#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"

#endif

using base::DictionaryValue;

@@ -166,8 +166,8 @@

#if defined(OS_CHROMEOS)

return (*avatar_index == kChromeOSDummyAvatarIndex ||

- (*avatar_index >= user_manager::kFirstDefaultImageIndex &&

- *avatar_index < user_manager::kDefaultImagesCount));

+ (*avatar_index >= chromeos::kFirstDefaultImageIndex &&

+ *avatar_index < chromeos::kDefaultImagesCount));

#else

// Check if the Chrome avatar index is set to a dummy value. Some early

// supervised user profiles on ChromeOS stored a dummy avatar index as a