Chromium Code Reviews| 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 93a0a6791a60eb88f871a984acd379c0910ed133..f0b328cfe7e864bfa06cda079d8a0c5bb3948916 100644 |
| --- a/chrome/browser/chromeos/login/existing_user_controller.cc |
| +++ b/chrome/browser/chromeos/login/existing_user_controller.cc |
| @@ -25,7 +25,6 @@ |
| #include "chrome/browser/chrome_notification_types.h" |
| #include "chrome/browser/chromeos/boot_times_loader.h" |
| #include "chrome/browser/chromeos/customization/customization_document.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" |
| @@ -53,7 +52,6 @@ |
| #include "chromeos/dbus/power_manager_client.h" |
| #include "chromeos/dbus/session_manager_client.h" |
| #include "chromeos/login/user_names.h" |
| -#include "chromeos/settings/cros_settings_names.h" |
|
bartfab (slow)
2014/12/15 16:08:40
Why are you removing this?
rkc
2014/12/15 20:45:58
Not sure, might be another merge fail. I put it ba
|
| #include "components/google/core/browser/google_util.h" |
| #include "components/policy/core/common/cloud/cloud_policy_core.h" |
| #include "components/policy/core/common/cloud/cloud_policy_store.h" |
| @@ -445,11 +443,6 @@ void ExistingUserController::Login(const UserContext& user_context, |
| return; |
| } |
| - if (user_context.GetUserType() == user_manager::USER_TYPE_RETAIL_MODE) { |
| - LoginAsRetailModeUser(); |
| - return; |
| - } |
| - |
| if (user_context.GetUserType() == user_manager::USER_TYPE_KIOSK_APP) { |
| LoginAsKioskApp(user_context.GetUserID(), specifics.kiosk_diagnostic_mode); |
| return; |
| @@ -855,21 +848,6 @@ bool ExistingUserController::password_changed() const { |
| return password_changed_; |
| } |
| -void ExistingUserController::LoginAsRetailModeUser() { |
| - PerformPreLoginActions(UserContext(user_manager::USER_TYPE_RETAIL_MODE, |
| - chromeos::login::kRetailModeUserName)); |
| - |
| - // TODO(rkc): Add a CHECK to make sure retail mode logins are allowed once |
| - // the enterprise policy wiring is done for retail mode. |
| - |
| - // Only one instance of LoginPerformer should exist at a time. |
| - login_performer_.reset(NULL); |
| - login_performer_.reset(new ChromeLoginPerformer(this)); |
| - login_performer_->LoginRetailMode(); |
| - SendAccessibilityAlert( |
| - l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_LOGIN_SIGNIN_DEMOUSER)); |
| -} |
| - |
| void ExistingUserController::LoginAsGuest() { |
| PerformPreLoginActions(UserContext(user_manager::USER_TYPE_GUEST, |
| chromeos::login::kGuestUserName)); |