Enabled consumer kiosk mode for all.

chrome/browser/chromeos/app_mode/kiosk_app_manager.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/chromeos/app_mode/kiosk_app_manager.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 94 matching lines @@
                                    std::string());
   }
 
   CrosSettings::Get()->SetString(
       kAccountsPrefDeviceLocalAccountAutoLoginId,
       app_id.empty() ? std::string() : GenerateKioskAppAccountId(app_id));
   CrosSettings::Get()->SetInteger(
       kAccountsPrefDeviceLocalAccountAutoLoginDelay, 0);
 }
 
-void KioskAppManager::EnableConsumerModeKiosk(
-    const KioskAppManager::EnableKioskModeCallback& callback) {
+void KioskAppManager::EnableConsumerKioskAutoLaunch(
+    const KioskAppManager::EnableKioskAutoLaunchCallback& callback) {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   connector->GetInstallAttributes()->LockDevice(
       std::string(),  // user
-      policy::DEVICE_MODE_CONSUMER_KIOSK,
+      policy::DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH,
       std::string(),  // device_id
       base::Bind(
           &KioskAppManager::OnLockDevice, base::Unretained(this), callback));
 }
 
-void KioskAppManager::GetConsumerKioskModeStatus(
-    const KioskAppManager::GetConsumerKioskModeStatusCallback& callback) {
+void KioskAppManager::GetConsumerKioskAutoLaunchStatus(
+    const KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback& callback) {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   connector->GetInstallAttributes()->ReadImmutableAttributes(
       base::Bind(&KioskAppManager::OnReadImmutableAttributes,
                  base::Unretained(this),
                  callback));
 }
 
 void KioskAppManager::OnLockDevice(
-    const KioskAppManager::EnableKioskModeCallback& callback,
+    const KioskAppManager::EnableKioskAutoLaunchCallback& callback,
     policy::EnterpriseInstallAttributes::LockResult result) {
   if (callback.is_null())
     return;
 
   callback.Run(result == policy::EnterpriseInstallAttributes::LOCK_SUCCESS);
 }
 
 void KioskAppManager::OnOwnerFileChecked(
-    const KioskAppManager::GetConsumerKioskModeStatusCallback& callback,
+    const KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback& callback,
     bool* owner_present) {
   ownership_established_ = *owner_present;
 
   if (callback.is_null())
     return;
 
   // If we have owner already established on the machine, don't let
   // consumer kiosk to be enabled.
   if (ownership_established_)
-    callback.Run(CONSUMER_KIOSK_MODE_DISABLED);
+    callback.Run(CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED);
   else
-    callback.Run(CONSUMER_KIOSK_MODE_CONFIGURABLE);
+    callback.Run(CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE);
 }
 
 void KioskAppManager::OnReadImmutableAttributes(
-    const KioskAppManager::GetConsumerKioskModeStatusCallback& callback) {
+    const KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback&
+        callback) {
   if (callback.is_null())
     return;
 
-  ConsumerKioskModeStatus status = CONSUMER_KIOSK_MODE_DISABLED;
+  ConsumerKioskAutoLaunchStatus status =
+      CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED;
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   policy::EnterpriseInstallAttributes* attributes =
       connector->GetInstallAttributes();
   switch (attributes->GetMode()) {
     case policy::DEVICE_MODE_NOT_SET: {
       if (!base::SysInfo::IsRunningOnChromeOS()) {
-        status = CONSUMER_KIOSK_MODE_CONFIGURABLE;
+        status = CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE;
       } else if (!ownership_established_) {
         bool* owner_present = new bool(false);
         content::BrowserThread::PostBlockingPoolTaskAndReply(
             FROM_HERE,
             base::Bind(&CheckOwnerFilePresence,
                        owner_present),
             base::Bind(&KioskAppManager::OnOwnerFileChecked,
                        base::Unretained(this),
                        callback,
                        base::Owned(owner_present)));
         return;
       }
       break;
     }
-    case policy::DEVICE_MODE_CONSUMER_KIOSK:
-      status = CONSUMER_KIOSK_MODE_ENABLED;
+    case policy::DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH:
+      status = CONSUMER_KIOSK_AUTO_LAUNCH_ENABLED;
       break;
     default:
       break;
   }
 
   callback.Run(status);
 }
 
 void KioskAppManager::SetEnableAutoLaunch(bool value) {
   SetAutoLoginState(value ? AUTOLOGIN_APPROVED : AUTOLOGIN_REJECTED);
@@ skipping 256 matching lines @@
 
 void KioskAppManager::SetAutoLoginState(AutoLoginState state) {
   PrefService* prefs = g_browser_process->local_state();
   DictionaryPrefUpdate dict_update(prefs,
                                    KioskAppManager::kKioskDictionaryName);
   dict_update->SetInteger(kKeyAutoLoginState, state);
   prefs->CommitPendingWrite();
 }
 
 }  // namespace chromeos