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

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, 10 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 463ddfaf9fecdfdad92c5441d4a091c565f742ec..fcdc559f4ebaa6d129c8e038efcf1f2b4660ee78 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -580,9 +580,10 @@ void ExistingUserController::OnStartEnterpriseEnrollment() {
}
void ExistingUserController::OnStartKioskEnableScreen() {
- KioskAppManager::Get()->GetConsumerKioskModeStatus(
- base::Bind(&ExistingUserController::OnConsumerKioskModeCheckCompleted,
- weak_factory_.GetWeakPtr()));
+ KioskAppManager::Get()->GetConsumerKioskAutoLaunchStatus(
+ base::Bind(
+ &ExistingUserController::OnConsumerKioskAutoLaunchCheckCompleted,
+ weak_factory_.GetWeakPtr()));
}
void ExistingUserController::OnStartDeviceReset() {
@@ -613,9 +614,9 @@ void ExistingUserController::Signout() {
NOTREACHED();
}
-void ExistingUserController::OnConsumerKioskModeCheckCompleted(
- KioskAppManager::ConsumerKioskModeStatus status) {
- if (status == KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE)
+void ExistingUserController::OnConsumerKioskAutoLaunchCheckCompleted(
+ KioskAppManager::ConsumerKioskAutoLaunchStatus status) {
+ if (status == KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE)
ShowKioskEnableScreen();
}
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.h ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698