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

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

Issue 130613004: Enabled consumer kiosk mode for all. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/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 013756a7c1f63cbd58873e6605b7231550d4da62..ac72619727a548a45623b238db27b8329962fe3b 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -579,9 +579,10 @@ void ExistingUserController::OnStartEnterpriseEnrollment() {
}
void ExistingUserController::OnStartKioskEnableScreen() {
- KioskAppManager::Get()->GetConsumerKioskModeStatus(
- base::Bind(&ExistingUserController::OnConsumerKioskModeCheckCompleted,
- weak_factory_.GetWeakPtr()));
+ KioskAppManager::Get()->GetConsumerKioskAutoLaunchStatus(
+ base::Bind(
+ &ExistingUserController::OnConsumerKioskModeAutoStartCheckCompleted,
+ weak_factory_.GetWeakPtr()));
}
void ExistingUserController::OnStartDeviceReset() {
@@ -612,9 +613,9 @@ void ExistingUserController::Signout() {
NOTREACHED();
}
-void ExistingUserController::OnConsumerKioskModeCheckCompleted(
- KioskAppManager::ConsumerKioskModeStatus status) {
- if (status == KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE)
+void ExistingUserController::OnConsumerKioskModeAutoStartCheckCompleted(
+ KioskAppManager::ConsumerKioskAutoLaunchStatus status) {
+ if (status == KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE)
ShowKioskEnableScreen();
}

Powered by Google App Engine
This is Rietveld 408576698