chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.cc - Issue 398753004: [cros] Move User class to user_manager component.

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/supervised/supervised_user_creation_flow.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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/supervised/supervised_user_creation_flow.h ('k') | chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.cc

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.cc

index 8fe3603a87935034f4f9e1d4619355493f61c514..85c2a0fe6eba4d893e5b6195575fdbbb8707b588 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.cc

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.cc

@@ -51,14 +51,14 @@ bool SupervisedUserCreationFlow::ShouldSkipPostLoginScreens() {

}

void SupervisedUserCreationFlow::HandleOAuthTokenStatusChange(

- User::OAuthTokenStatus status) {

- if (status == User::OAUTH_TOKEN_STATUS_UNKNOWN)

+ user_manager::User::OAuthTokenStatus status) {

+ if (status == user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN)

return;

- if (status == User::OAUTH2_TOKEN_STATUS_INVALID) {

+ if (status == user_manager::User::OAUTH2_TOKEN_STATUS_INVALID) {

GetScreen(host())->ShowManagerInconsistentStateErrorScreen();

return;

}

- DCHECK(status == User::OAUTH2_TOKEN_STATUS_VALID);

+ DCHECK(status == user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

// We expect that LaunchExtraSteps is called by this time (local

// authentication happens before oauth token validation).

token_validated_ = true;