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

Unified Diff: chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.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/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc
index 3e82671893dfff12ce8c2b9f7fe3f47c689e7cab..5b8959c77b77d9eb4d7cd54a928fce5c337715ea 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc
@@ -44,17 +44,18 @@ void KioskEnableScreenHandler::Show() {
return;
}
- KioskAppManager::Get()->GetConsumerKioskModeStatus(
- base::Bind(&KioskEnableScreenHandler::OnGetConsumerKioskModeStatus,
- weak_ptr_factory_.GetWeakPtr()));
+ KioskAppManager::Get()->GetConsumerKioskAutoLaunchStatus(
+ base::Bind(
+ &KioskEnableScreenHandler::OnGetConsumerKioskAutoLaunchStatus,
+ weak_ptr_factory_.GetWeakPtr()));
}
-void KioskEnableScreenHandler::OnGetConsumerKioskModeStatus(
- KioskAppManager::ConsumerKioskModeStatus status) {
+void KioskEnableScreenHandler::OnGetConsumerKioskAutoLaunchStatus(
+ KioskAppManager::ConsumerKioskAutoLaunchStatus status) {
is_configurable_ =
- (status == KioskAppManager::CONSUMER_KIOSK_MODE_CONFIGURABLE);
+ (status == KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE);
if (!is_configurable_) {
- LOG(WARNING) << "Consumer kiosk feature is not configurable anymore!";
+ LOG(WARNING) << "Consumer kiosk auto launch feature is not configurable!";
return;
}
@@ -124,12 +125,13 @@ void KioskEnableScreenHandler::HandleOnEnable() {
return;
}
- KioskAppManager::Get()->EnableConsumerModeKiosk(
- base::Bind(&KioskEnableScreenHandler::OnEnableConsumerModeKiosk,
+ KioskAppManager::Get()->EnableConsumerKioskAutoLaunch(
+ base::Bind(&KioskEnableScreenHandler::OnEnableConsumerKioskAutoLaunch,
weak_ptr_factory_.GetWeakPtr()));
}
-void KioskEnableScreenHandler::OnEnableConsumerModeKiosk(bool success) {
+void KioskEnableScreenHandler::OnEnableConsumerKioskAutoLaunch(
+ bool success) {
if (!success)
LOG(WARNING) << "Consumer kiosk mode can't be enabled!";

Powered by Google App Engine
This is Rietveld 408576698