Index: chrome/browser/chromeos/login/existing_user_controller.cc |
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc |
index 1e969ed6d61e2167399d2e2eecfc48d789bf34c1..e6c79a7488ecb1f451d29521e114c282f7780681 100644 |
--- a/chrome/browser/chromeos/login/existing_user_controller.cc |
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc |
@@ -29,7 +29,6 @@ |
#include "chrome/browser/chromeos/customization_document.h" |
#include "chrome/browser/chromeos/first_run/first_run.h" |
#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
-#include "chrome/browser/chromeos/login/auth/chrome_login_performer.h" |
#include "chrome/browser/chromeos/login/helper.h" |
#include "chrome/browser/chromeos/login/login_utils.h" |
#include "chrome/browser/chromeos/login/session/user_session_manager.h" |
@@ -461,7 +460,7 @@ |
if (!login_performer_.get() || num_login_attempts_ <= 1) { |
// Only one instance of LoginPerformer should exist at a time. |
login_performer_.reset(NULL); |
- login_performer_.reset(new ChromeLoginPerformer(this)); |
+ login_performer_.reset(new LoginPerformer(this)); |
} |
is_login_in_progress_ = true; |
@@ -486,7 +485,7 @@ |
// Only one instance of LoginPerformer should exist at a time. |
login_performer_.reset(NULL); |
- login_performer_.reset(new ChromeLoginPerformer(this)); |
+ login_performer_.reset(new LoginPerformer(this)); |
is_login_in_progress_ = true; |
login_performer_->LoginRetailMode(); |
SendAccessibilityAlert( |
@@ -541,7 +540,7 @@ |
// Only one instance of LoginPerformer should exist at a time. |
login_performer_.reset(NULL); |
- login_performer_.reset(new ChromeLoginPerformer(this)); |
+ login_performer_.reset(new LoginPerformer(this)); |
is_login_in_progress_ = true; |
login_performer_->LoginOffTheRecord(); |
SendAccessibilityAlert( |
@@ -1255,7 +1254,7 @@ |
const UserContext& user_context) { |
// Only one instance of LoginPerformer should exist at a time. |
login_performer_.reset(NULL); |
- login_performer_.reset(new ChromeLoginPerformer(this)); |
+ login_performer_.reset(new LoginPerformer(this)); |
is_login_in_progress_ = true; |
login_performer_->LoginAsPublicSession(user_context); |
SendAccessibilityAlert( |