chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.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_controller_new.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_authentication.cc ('k') | chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 13765e119e8d760c768a24bc7ba5c8a13a6b6f80..56211fcd70f3ffe754c50d9c6915272c779f21f0 100644

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

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

@@ -18,7 +18,6 @@

#include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"

#include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"

#include "chrome/browser/chromeos/login/users/supervised_user_manager.h"

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

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

#include "chrome/browser/lifetime/application_lifetime.h"

#include "chrome/browser/sync/profile_sync_service.h"

@@ -28,6 +27,7 @@

#include "chromeos/dbus/session_manager_client.h"

#include "chromeos/login/auth/key.h"

#include "chromeos/login/auth/user_context.h"

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

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/user_metrics.h"

#include "crypto/random.h"

@@ -368,8 +368,9 @@ void SupervisedUserCreationControllerNew::OnSupervisedUserFilesStored(

}

// Assume that new token is valid. It will be automatically invalidated if

// sync service fails to use it.

- UserManager::Get()->SaveUserOAuthStatus(creation_context_->local_user_id,

- User::OAUTH2_TOKEN_STATUS_VALID);

+ UserManager::Get()->SaveUserOAuthStatus(

+ creation_context_->local_user_id,

+ user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

stage_ = TOKEN_WRITTEN;