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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 608283003: Remove retail mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
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 f91629dfd69ce5237ea0905fe0ada2faa1a3db81..321db4c460560dfbcf9958258b98bc38259ddb18 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_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"
#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"
@@ -497,11 +495,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;
@@ -922,21 +915,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));

Powered by Google App Engine
This is Rietveld 408576698