Enabled consumer kiosk mode for all.

chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 76 matching lines @@
   *app_id = candidate_id;
   return true;
 }
 
 }  // namespace
 
 KioskAppsHandler::KioskAppsHandler()
     : kiosk_app_manager_(KioskAppManager::Get()),
       initialized_(false),
       is_kiosk_enabled_(false),
+      is_auto_launch_enabled_(false),
       weak_ptr_factory_(this) {
   kiosk_app_manager_->AddObserver(this);
 }
 
 KioskAppsHandler::~KioskAppsHandler() {
   kiosk_app_manager_->RemoveObserver(this);
 }
 
 void KioskAppsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("initializeKioskAppSettings",
@@ skipping 81 matching lines @@
                                    app_dict);
 }
 
 void KioskAppsHandler::OnKioskAppDataLoadFailure(const std::string& app_id) {
   base::StringValue app_id_value(app_id);
   web_ui()->CallJavascriptFunction("extensions.KioskAppsOverlay.showError",
                                    app_id_value);
 }
 
 
-void KioskAppsHandler::OnGetConsumerKioskModeStatus(
-    chromeos::KioskAppManager::ConsumerKioskModeStatus status) {
+void KioskAppsHandler::OnGetConsumerKioskAutoLaunchStatus(
+    chromeos::KioskAppManager::ConsumerKioskAutoLaunchStatus status) {
   initialized_ = true;
   is_kiosk_enabled_ =
-      ((status == KioskAppManager::CONSUMER_KIOSK_MODE_ENABLED) &&
-          chromeos::UserManager::Get()->IsCurrentUserOwner()) ||
+      chromeos::UserManager::Get()->IsCurrentUserOwner() ||
       !base::SysInfo::IsRunningOnChromeOS();
 
+  is_auto_launch_enabled_ =
+      status == KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_ENABLED;
+
   if (is_kiosk_enabled_) {
-    base::FundamentalValue enabled(is_kiosk_enabled_);
+    base::DictionaryValue kiosk_params;
+    kiosk_params.SetBoolean("kioskEnabled", is_kiosk_enabled_);
+    kiosk_params.SetBoolean("autoLaunchEnabled", is_auto_launch_enabled_);
     web_ui()->CallJavascriptFunction("extensions.KioskAppsOverlay.enableKiosk",
-                                     enabled);
+                                     kiosk_params);
   }
 }
 
 
 void KioskAppsHandler::OnKioskAppsSettingsChanged() {
   SendKioskAppSettings();
 }
 
 void KioskAppsHandler::SendKioskAppSettings() {
   if (!initialized_ || !is_kiosk_enabled_)
@@ skipping 21 matching lines @@
     apps_list->Append(app_info.release());
   }
   settings.SetWithoutPathExpansion("apps", apps_list.release());
 
   web_ui()->CallJavascriptFunction("extensions.KioskAppsOverlay.setSettings",
                                    settings);
 }
 
 void KioskAppsHandler::HandleInitializeKioskAppSettings(
     const base::ListValue* args) {
-  KioskAppManager::Get()->GetConsumerKioskModeStatus(
-      base::Bind(&KioskAppsHandler::OnGetConsumerKioskModeStatus,
+  KioskAppManager::Get()->GetConsumerKioskAutoLaunchStatus(
+      base::Bind(&KioskAppsHandler::OnGetConsumerKioskAutoLaunchStatus,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void KioskAppsHandler::HandleGetKioskAppSettings(const base::ListValue* args) {
   SendKioskAppSettings();
 }
 
 
 void KioskAppsHandler::HandleAddKioskApp(const base::ListValue* args) {
   if (!initialized_ || !is_kiosk_enabled_)
@@ skipping 16 matching lines @@
     return;
 
   std::string app_id;
   CHECK(args->GetString(0, &app_id));
 
   kiosk_app_manager_->RemoveApp(app_id);
 }
 
 void KioskAppsHandler::HandleEnableKioskAutoLaunch(
     const base::ListValue* args) {
-  if (!initialized_ || !is_kiosk_enabled_)
+  if (!initialized_ || !is_kiosk_enabled_ || !is_auto_launch_enabled_)
     return;
 
   std::string app_id;
   CHECK(args->GetString(0, &app_id));
 
   kiosk_app_manager_->SetAutoLaunchApp(app_id);
 }
 
 void KioskAppsHandler::HandleDisableKioskAutoLaunch(
     const base::ListValue* args) {
-  if (!initialized_ || !is_kiosk_enabled_)
+  if (!initialized_ || !is_kiosk_enabled_ || !is_auto_launch_enabled_)
     return;
 
   std::string app_id;
   CHECK(args->GetString(0, &app_id));
 
   std::string startup_app_id = kiosk_app_manager_->GetAutoLaunchApp();
   if (startup_app_id != app_id)
     return;
 
   kiosk_app_manager_->SetAutoLaunchApp("");
 }
 
 void KioskAppsHandler::HandleSetDisableBailoutShortcut(
     const base::ListValue* args) {
   if (!initialized_ || !is_kiosk_enabled_)
     return;
 
   bool disable_bailout_shortcut;
   CHECK(args->GetBoolean(0, &disable_bailout_shortcut));
 
   CrosSettings::Get()->SetBoolean(
       kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled,
       !disable_bailout_shortcut);
 }
 
 }  // namespace chromeos