Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(711)

Unified Diff: chrome/browser/chromeos/login/user_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/ui/webui_login_display.cc ('k') | chrome/browser/chromeos/login/user_flow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_flow.h
diff --git a/chrome/browser/chromeos/login/user_flow.h b/chrome/browser/chromeos/login/user_flow.h
index 98e09578f94c28ca531852972619ad576eaf8364..c487e26505cdfd3bc236d3b6b9b9dcb6613a5e8e 100644
--- a/chrome/browser/chromeos/login/user_flow.h
+++ b/chrome/browser/chromeos/login/user_flow.h
@@ -6,9 +6,9 @@
#define CHROME_BROWSER_CHROMEOS_LOGIN_USER_FLOW_H_
#include "base/compiler_specific.h"
-#include "chrome/browser/chromeos/login/users/user.h"
#include "chrome/browser/profiles/profile.h"
#include "chromeos/login/auth/auth_status_consumer.h"
+#include "components/user_manager/user.h"
namespace chromeos {
@@ -29,7 +29,8 @@ class UserFlow {
virtual bool HandleLoginFailure(const AuthFailure& failure) = 0;
virtual void HandleLoginSuccess(const UserContext& context) = 0;
virtual bool HandlePasswordChangeDetected() = 0;
- virtual void HandleOAuthTokenStatusChange(User::OAuthTokenStatus status) = 0;
+ virtual void HandleOAuthTokenStatusChange(
+ user_manager::User::OAuthTokenStatus status) = 0;
virtual void LaunchExtraSteps(Profile* profile) = 0;
void set_host(LoginDisplayHost* host) {
@@ -56,8 +57,8 @@ class DefaultUserFlow : public UserFlow {
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;
};
« no previous file with comments | « chrome/browser/chromeos/login/ui/webui_login_display.cc ('k') | chrome/browser/chromeos/login/user_flow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698