chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc - Issue 1534173003: ChromeOS user_manager: move all KnownUser code to separate file.

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/screens/chrome_user_selection_screen.cc

Issue 1534173003: ChromeOS user_manager: move all KnownUser code to separate file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: s/FindUsingSAML/IsUsingSAML/ Created 5 years 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/reauth_stats.cc ('k') | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

diff --git a/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc b/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

index 4d00564d9d22a01d642ba3a8784aa6d7248ed084..d8bd84b6087b4a5f71b7831a79cba2930db9404d 100644

--- a/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

+++ b/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

@@ -22,6 +22,7 @@

#include "components/policy/core/common/policy_map.h"

#include "components/policy/core/common/policy_types.h"

#include "components/signin/core/account_id/account_id.h"

+#include "components/user_manager/known_user.h"

#include "components/user_manager/user.h"

#include "components/user_manager/user_manager.h"

#include "components/user_manager/user_type.h"

@@ -78,8 +79,7 @@ void ChromeUserSelectionScreen::OnDeviceLocalAccountsChanged() {

void ChromeUserSelectionScreen::CheckForPublicSessionDisplayNameChange(

policy::DeviceLocalAccountPolicyBroker* broker) {

const AccountId& account_id =

- user_manager::UserManager::GetKnownUserAccountId(broker->user_id(),

- std::string());

+ user_manager::known_user::GetAccountId(broker->user_id(), std::string());

DCHECK(account_id.is_valid());

const std::string& display_name = broker->GetDisplayName();

if (display_name == public_session_display_names_[account_id])

@@ -110,8 +110,7 @@ void ChromeUserSelectionScreen::CheckForPublicSessionDisplayNameChange(

void ChromeUserSelectionScreen::CheckForPublicSessionLocalePolicyChange(

policy::DeviceLocalAccountPolicyBroker* broker) {

const AccountId& account_id =

- user_manager::UserManager::GetKnownUserAccountId(broker->user_id(),

- std::string());

+ user_manager::known_user::GetAccountId(broker->user_id(), std::string());

DCHECK(account_id.is_valid());

const policy::PolicyMap::Entry* entry =

broker->core()->store()->policy_map().Get(policy::key::kSessionLocales);

« no previous file with comments | « chrome/browser/chromeos/login/reauth_stats.cc ('k') | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('j') | no next file with comments »