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

Unified Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

Issue 608283003: Remove retail mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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/enrollment/enrollment_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
index 7217b30f6d90cca8c8276a13d778a9c8163ade61..d48c2efb292f8b1ea456c75af59cc860eb2aff86 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
@@ -221,15 +221,6 @@ void EnrollmentScreen::OnCancel() {
}
void EnrollmentScreen::OnConfirmationClosed() {
- // If the machine has been put in KIOSK mode we have to restart the session
- // here to go in the proper KIOSK mode login screen.
- policy::BrowserPolicyConnectorChromeOS* connector =
- g_browser_process->platform_part()->browser_policy_connector_chromeos();
- if (connector->GetDeviceMode() == policy::DEVICE_MODE_RETAIL_KIOSK) {
- DBusThreadManager::Get()->GetSessionManagerClient()->StopSession();
- return;
- }
-
if (is_auto_enrollment() &&
!enrollment_failed_once_ &&
!user_.empty() &&
@@ -260,8 +251,6 @@ void EnrollmentScreen::RegisterForDevicePolicy(const std::string& token) {
policy::DeviceCloudPolicyInitializer::AllowedDeviceModes device_modes;
device_modes[policy::DEVICE_MODE_ENTERPRISE] = true;
- device_modes[policy::DEVICE_MODE_RETAIL_KIOSK] =
- enrollment_mode_ == EnrollmentScreenActor::ENROLLMENT_MODE_MANUAL;
connector->ScheduleServiceInitialization(0);
policy::DeviceCloudPolicyInitializer* dcp_initializer =

Powered by Google App Engine
This is Rietveld 408576698