Put Kiosk App parameters into device settings.

chrome/browser/chromeos/settings/cros_settings_names.cc

Index: chrome/browser/chromeos/settings/cros_settings_names.cc
diff --git a/chrome/browser/chromeos/settings/cros_settings_names.cc b/chrome/browser/chromeos/settings/cros_settings_names.cc
index 7a0a93bf3b7e893f3ea64cc8bb4b408c235f8755..f3ec3bd6f73fcc29da3685cb2bc08edec035d529 100644
--- a/chrome/browser/chromeos/settings/cros_settings_names.cc
+++ b/chrome/browser/chromeos/settings/cros_settings_names.cc
@@ -24,6 +24,8 @@ const char kAccountsPrefDeviceLocalAccountAutoLoginId[] =
     "cros.accounts.deviceLocalAccountAutoLoginId";
 const char kAccountsPrefDeviceLocalAccountAutoLoginDelay[] =
     "cros.accounts.deviceLocalAccountAutoLoginDelay";
+const char kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled[] =
+    "cros.accounts.deviceLocalAccountAutoLoginBailoutEnabled";
 
 // Name of signed setting persisted on device, writeable only by owner.
 const char kSettingProxyEverywhere[] = "cros.proxy.everywhere";
@@ -99,23 +101,6 @@ const char kAllowRedeemChromeOsRegistrationOffers[] =
 // start-up.
 const char kStartUpFlags[] = "cros.startup_flags";
 
-// A prefix for all kiosk app setting names.
-const char kKioskAppSettingsPrefix[] = "cros.kiosk.";
-const int kKioskAppSettingsPrefixLength =
-    arraysize(kKioskAppSettingsPrefix) - 1;  // exclude NULL terminator.
-
-// A list of available kiosk application IDs.
-const char kKioskApps[] = "cros.kiosk.apps";
-
-// An app id string of the current auto launch app. Empty string means no auto
-// launch app. Default is empty.
-const char kKioskAutoLaunch[] = "cros.kiosk.auto_launch";
-
-// A boolean pref of whether the app launch bailout shortcut should be disabled.
-// When set to true, the bailout shortcut is disabled. Default is false.
-const char kKioskDisableBailoutShortcut[] =
-    "cros.kiosk.disable_bailout_shortcut";
-
 // A string pref for the restrict parameter to be appended to the Variations URL
 // when pinging the Variations server.
 const char kVariationsRestrictParameter[] =
@@ -123,4 +108,5 @@ const char kVariationsRestrictParameter[] =
 
 // A boolean pref that indicates whether attestation is enabled for the device.
 const char kDeviceAttestationEnabled[] = "cros.device.attestation_enabled";
+
 }  // namespace chromeos