chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc - Issue 600733004: Rename GetUsersAdmittedForMultiProfile to GetUsersAllowedForMultiProfile

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

Issue 600733004: Rename GetUsersAdmittedForMultiProfile to GetUsersAllowedForMultiProfile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 3 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 | « chrome/browser/chromeos/login/users/chrome_user_manager_impl.h ('k') | chrome/browser/chromeos/login/users/fake_user_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4b2d7cf077dbd88dee6a24a2e4fca1ac9f49f1bd..30941337a09bccdb2a75e0b2e4879e9865a4636b 100644

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

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

@@ -192,7 +192,7 @@ SupervisedUserManager* ChromeUserManagerImpl::GetSupervisedUserManager() {

return supervised_user_manager_.get();

}

-user_manager::UserList ChromeUserManagerImpl::GetUsersAdmittedForMultiProfile()

+user_manager::UserList ChromeUserManagerImpl::GetUsersAllowedForMultiProfile()

const {

// Supervised users are not allowed to use multi-profiles.

if (GetLoggedInUsers().size() == 1 &&

@@ -1028,7 +1028,7 @@ void ChromeUserManagerImpl::UpdateNumberOfUsers() {

size_t users = GetLoggedInUsers().size();

if (users) {

// Write the user number as UMA stat when a multi user session is possible.

- if ((users + GetUsersAdmittedForMultiProfile().size()) > 1)

+ if ((users + GetUsersAllowedForMultiProfile().size()) > 1)

ash::MultiProfileUMA::RecordUserCount(users);

}