chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h - 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.h

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_controller_new.cc ('k') | chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.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.h

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

index 35098961465d54941b10a668c97924fe3e16f7e4..5d063821a2f7293010a18a10a327eb197724886b 100644

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

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

@@ -9,7 +9,7 @@

#include "base/compiler_specific.h"

#include "base/strings/string16.h"

#include "chrome/browser/chromeos/login/user_flow.h"

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

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

class Profile;

@@ -28,8 +28,8 @@ class SupervisedUserCreationFlow : public ExtendedUserFlow {

virtual bool HandleLoginFailure(const AuthFailure& failure) OVERRIDE;

virtual void HandleLoginSuccess(const UserContext& context) OVERRIDE;

virtual bool HandlePasswordChangeDetected() OVERRIDE;

- virtual void HandleOAuthTokenStatusChange(User::OAuthTokenStatus status)

- OVERRIDE;

+ virtual void HandleOAuthTokenStatusChange(

+ user_manager::User::OAuthTokenStatus status) OVERRIDE;

virtual void LaunchExtraSteps(Profile* profile) OVERRIDE;

private:

// Display name for user being created.