chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc - Issue 718673002: New user type introduced. Combines regular and supervised features.

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/avatar/user_image_manager_impl.cc

Issue 718673002: New user type introduced. Combines regular and supervised features. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Comments addressed. Created 6 years, 1 month 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/session/user_session_manager.cc ('k') | chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc » ('j') | components/user_manager/user.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc

diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc

index 4df33d8e9b2d9a16b60dda8e7ebf6952b7591903..61797afd683592ab88a9e1fe238a38c4c7a3635a 100644

--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc

+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc

@@ -33,7 +33,6 @@

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

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

#include "components/user_manager/user_manager.h"

-#include "components/user_manager/user_type.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

#include "policy/policy_constants.h"

@@ -1023,8 +1022,7 @@ bool UserImageManagerImpl::IsUserLoggedInAndRegular() const {

const user_manager::User* user = GetUser();

if (!user)

return false;

- return user->is_logged_in() &&

- user->GetType() == user_manager::USER_TYPE_REGULAR;

+ return user->is_logged_in() && user->IsRegular();

}

} // namespace chromeos