| 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;
|
| };
|
|
|
|
|