chrome/browser/chromeos/login/screens/user_selection_screen.h - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

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/user_selection_screen.h

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Created 5 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 | « chrome/browser/chromeos/login/screens/user_image_screen.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/user_selection_screen.h

diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h

index 0c2879b54c222e2f5bfe15628e2590ae7359d243..f52657a17c42b28e17742fbe14fc048844afcd8e 100644

--- a/chrome/browser/chromeos/login/screens/user_selection_screen.h

+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h

@@ -17,9 +17,9 @@

#include "chrome/browser/chromeos/login/ui/models/user_board_model.h"

#include "components/proximity_auth/screenlock_bridge.h"

#include "components/user_manager/user.h"

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

#include "ui/base/user_activity/user_activity_observer.h"

-class AccountId;

class EasyUnlockService;

namespace chromeos {

@@ -122,7 +122,7 @@

EasyUnlockService* GetEasyUnlockServiceForUser(

const std::string& user_id) const;

- void OnUserStatusChecked(const AccountId& account_id,

+ void OnUserStatusChecked(const user_manager::UserID& user_id,

TokenHandleUtil::TokenHandleStatus status);

// Whether to show guest login.