Enabled consumer kiosk mode for all.

chrome/browser/chromeos/app_mode/kiosk_app_manager.h

Index: chrome/browser/chromeos/app_mode/kiosk_app_manager.h
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
index e67b86ceec9baee2ad6db31bd4abdea010cca244..f2c180f9fd4de8fdff261f7762b73cfd15b2ceea 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
@@ -38,19 +38,19 @@ class KioskAppManagerObserver;
 // KioskAppManager manages cached app data.
 class KioskAppManager : public KioskAppDataDelegate {
  public:
-  enum ConsumerKioskModeStatus {
-    // Consumer kiosk mode can be enabled on this machine.
-    CONSUMER_KIOSK_MODE_CONFIGURABLE,
-    // Consumer kiosk is enabled on this machine.
-    CONSUMER_KIOSK_MODE_ENABLED,
-    // Consumer kiosk mode is disabled ans cannot any longer be enabled on
-    // this machine.
-    CONSUMER_KIOSK_MODE_DISABLED,
+  enum ConsumerKioskAutoLaunchStatus {
+    // Consumer kiosk mode auto-launch feature can be enabled on this machine.
+    CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE,
+    // Consumer kiosk auto-launch feature is enabled on this machine.
+    CONSUMER_KIOSK_AUTO_LAUNCH_ENABLED,
+    // Consumer kiosk mode auto-launch feature is disabled and cannot any longer
+    // be enabled on this machine.
+    CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED,
   };
 
-  typedef base::Callback<void(bool success)> EnableKioskModeCallback;
-  typedef base::Callback<void(ConsumerKioskModeStatus status)>
-      GetConsumerKioskModeStatusCallback;
+  typedef base::Callback<void(bool success)> EnableKioskAutoLaunchCallback;
+  typedef base::Callback<void(ConsumerKioskAutoLaunchStatus status)>
+      GetConsumerKioskAutoLaunchStatusCallback;
 
   // Struct to hold app info returned from GetApps() call.
   struct App {
@@ -87,13 +87,14 @@ class KioskAppManager : public KioskAppDataDelegate {
   // Registers kiosk app entries in local state.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
-  // Initiates reading of consumer kiosk mode status.
-  void GetConsumerKioskModeStatus(
-      const GetConsumerKioskModeStatusCallback& callback);
+  // Initiates reading of consumer kiosk mode auto-launch status.
+  void GetConsumerKioskAutoLaunchStatus(
+      const GetConsumerKioskAutoLaunchStatusCallback& callback);
 
-  // Enables consumer kiosk mode feature. Upon completion, |callback| will be
-  // invoked with outcome of this operation.
-  void EnableConsumerModeKiosk(const EnableKioskModeCallback& callback);
+  // Enables consumer kiosk mode app auto-launch feature. Upon completion,
+  // |callback| will be invoked with outcome of this operation.
+  void EnableConsumerModeKioskAutoStart(

[xiyuan, 2014/01/23 22:05:10]

nit: Can we be consistent with KioskMode -> KisokAutoLaunch renaming?
EnableConsumerModeKioskAutoStart -> EnableConsumerKioskAutoLaunch

[zel, 2014/01/23 22:55:27]

Done.

+      const EnableKioskAutoLaunchCallback& callback);
 
   // Returns auto launcher app id or an empty string if there is none.
   std::string GetAutoLaunchApp() const;
@@ -178,17 +179,17 @@ class KioskAppManager : public KioskAppDataDelegate {
   // Callback for EnterpriseInstallAttributes::LockDevice() during
   // EnableConsumerModeKiosk() call.
   void OnLockDevice(
-      const EnableKioskModeCallback& callback,
+      const EnableKioskAutoLaunchCallback& callback,
       policy::EnterpriseInstallAttributes::LockResult result);
 
   // Callback for EnterpriseInstallAttributes::ReadImmutableAttributes() during
   // GetConsumerKioskModeStatus() call.
   void OnReadImmutableAttributes(
-      const GetConsumerKioskModeStatusCallback& callback);
+      const GetConsumerKioskAutoLaunchStatusCallback& callback);
 
   // Callback for reading handling checks of the owner public.
   void OnOwnerFileChecked(
-      const GetConsumerKioskModeStatusCallback& callback,
+      const GetConsumerKioskAutoLaunchStatusCallback& callback,
       bool* owner_present);
 
   // Reads/writes auto login state from/to local state.