chrome/browser/ui/ash/system_tray_delegate_chromeos.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/ui/ash/system_tray_delegate_chromeos.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: 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/login/existing_user_controller.cc ('K') | « chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc ('k') | components/user_manager/user.h » ('j') | components/user_manager/user.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

index 105c9c5cb32ccdbbffe6024e3ffc9940de3020c1..70ceff523d8406b931f274c9bed1c43e1ad7b675 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

@@ -554,10 +554,8 @@ void SystemTrayDelegateChromeOS::ShowUserLogin() {

return;

// Only regular users could add other users to current session.

- if (user_manager::UserManager::Get()->GetActiveUser()->GetType() !=

- user_manager::USER_TYPE_REGULAR) {

+ if (!user_manager::UserManager::Get()->GetActiveUser()->IsRegular())

Nikita (slow) 2014/11/11 12:06:36 IsRegular() && !IsSupervised() Might as well add

merkulova 2014/11/11 15:47:43 As far as we need it once for now, leaving it as c

return;

- }

if (static_cast<int>(

user_manager::UserManager::Get()->GetLoggedInUsers().size()) >=