chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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/saml/saml_offline_signin_limiter_unittest.cc ('k') | chrome/browser/chromeos/login/screens/user_image_screen.h » ('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 00332b438c452fb9109fe7de063fe6a986ef51f5..4eecbd97ca22f54944e4b5c9eb7ba08dbcd64749 100644

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

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

@@ -13,7 +13,6 @@

#include "base/values.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_process_platform_part.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

#include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"

#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

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

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

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

#include "components/user_manager/user.h"

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

#include "components/user_manager/user_type.h"

#include "policy/policy_constants.h"

@@ -152,7 +152,8 @@ void ChromeUserSelectionScreen::CheckForPublicSessionLocalePolicyChange(

void ChromeUserSelectionScreen::SetPublicSessionDisplayName(

const std::string& user_id) {

- const user_manager::User* user = UserManager::Get()->FindUser(user_id);

+ const user_manager::User* user =

+ user_manager::UserManager::Get()->FindUser(user_id);

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

return;