chrome/browser/chromeos/login/users/multi_profile_user_controller.cc - Issue 657923003: Owner is allowed as a secondary user. chrome://settings honors profile now.

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/multi_profile_user_controller.cc

Issue 657923003: Owner is allowed as a secondary user. chrome://settings honors profile now. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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 | « no previous file | chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc » ('j') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/multi_profile_user_controller.cc

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

index f328c2c24287b74b3d107f66cfb349fa749fc2ab..0137a0efd52c0c6c43578b65e2b1fd99de2665bb 100644

--- a/chrome/browser/chromeos/login/users/multi_profile_user_controller.cc

+++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller.cc

@@ -142,10 +142,6 @@ bool MultiProfileUserController::IsUserAllowedInSession(

if (primary_user_email.empty() || primary_user_email == user_email)

return SetUserAllowedReason(reason, ALLOWED);

- // Owner is not allowed to be secondary user.

- if (user_manager->GetOwnerEmail() == user_email)

- return SetUserAllowedReason(reason, NOT_ALLOWED_OWNER_AS_SECONDARY);

// Don't allow profiles potentially tainted by data fetched with policy-pushed

// certificates to join a multiprofile session.

if (policy::PolicyCertServiceFactory::UsedPolicyCertificates(user_email))