chrome/browser/chromeos/login/session/user_session_manager.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/session/user_session_manager.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: First 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

« chrome/browser/chromeos/accessibility/accessibility_manager.cc ('K') | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc » ('j') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/session/user_session_manager.cc

diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc

index 374cf3fa791745c104d82238fc08ed93612b7b1e..746287a52494410a0df550dc710521a5a259bada 100644

--- a/chrome/browser/chromeos/login/session/user_session_manager.cc

+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc

@@ -507,7 +507,7 @@ bool UserSessionManager::RespectLocalePreference(

bool UserSessionManager::NeedsToUpdateEasyUnlockKeys() const {

return EasyUnlockService::IsSignInEnabled() &&

!user_context_.GetUserID().empty() &&

- user_context_.GetUserType() == user_manager::USER_TYPE_REGULAR &&

+ user_manager::User::TypeIsRegular(user_context_.GetUserType()) &&

user_context_.GetKey() && !user_context_.GetKey()->GetSecret().empty();

}

@@ -1207,7 +1207,7 @@ void UserSessionManager::UpdateEasyUnlockKeys(const UserContext& user_context) {

// authenticator.

const user_manager::User* user =

user_manager::UserManager::Get()->FindUser(user_context.GetUserID());

- if (!user || user->GetType() != user_manager::USER_TYPE_REGULAR)

+ if (!user || !user->IsRegular())

return;

// Bail if |user_context| does not have secret.