Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / user_flow.cc

diff --git a/src/chrome/browser/chromeos/login/user_flow.cc b/src/chrome/browser/chromeos/login/user_flow.cc
index be891a6..fcfc9ca 100644 (file)
--- a/src/chrome/browser/chromeos/login/user_flow.cc
+++ b/src/chrome/browser/chromeos/login/user_flow.cc
@@ -5,14 +5,14 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 
 namespace chromeos {
 
 namespace {
 
 void UnregisterFlow(const std::string& user_id) {
-  UserManager::Get()->ResetUserFlow(user_id);
+  ChromeUserManager::Get()->ResetUserFlow(user_id);
 }
 
 } // namespace
@@ -40,7 +40,7 @@ bool DefaultUserFlow::ShouldSkipPostLoginScreens() {
   return false;
 }
 
-bool DefaultUserFlow::HandleLoginFailure(const LoginFailure& failure) {
+bool DefaultUserFlow::HandleLoginFailure(const AuthFailure& failure) {
   return false;
 }
 
@@ -51,7 +51,7 @@ bool DefaultUserFlow::HandlePasswordChangeDetected() {
 }
 
 void DefaultUserFlow::HandleOAuthTokenStatusChange(
-    User::OAuthTokenStatus status) {
+    user_manager::User::OAuthTokenStatus status) {
 }
 
 void DefaultUserFlow::LaunchExtraSteps(Profile* profile) {