app_mode: Add a flag for kiosk app settings UI.

Disable kiosk app settings UI by default and add a flag to turn it on.
This is a CL for M28 before it is moved to extensions UI.

BUG=243859

Review URL: https://chromiumcodereview.appspot.com/15715014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202699 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/generated_resources.grd

@@ -7037,6 +7037,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_FLAGS_DISABLE_FULLSCREEN_APP_DESCRIPTION" desc="Description for the flag to disable auto run kiosk applications in full screen.">
           Disables making kiosk applications run in full screen automatically..
         </message>
+        <message name="IDS_FLAGS_ENABLE_KIOSK_APP_SETTINGS_NAME" desc="Name for the flag to enable kiosk app settings UI.">
+          Enable kiosk app settings UI.
+        </message>
+        <message name="IDS_FLAGS_ENABLE_KIOSK_APP_SETTINGS_DESCRIPTION" desc="Description for the flag to enable kiosk app settings UI.">
+          Enable kiosk app management in settings.
+        </message>
       </if>
       <message name="IDS_FLAGS_FULL_HISTORY_SYNC_NAME" desc="Name of the flag to disable full history sync.">
         Disable full history sync
@@ -14851,7 +14857,7 @@ You need to be signed in to use this feature.
     <message name="IDS_PROFILES_REMOVE_SHORTCUT" desc="Remove Shortcut button">
       Remove the desktop shortcut for this user
     </message>
-      
+
     <!-- Limited-user creation wizard dialogs -->
     <message name="IDS_NEW_LIMITED_USER_LEARN_MORE_TITLE" desc="Title for the 'Learn more' dialog for the limited user feature.">
       What is a limited user?

chrome/browser/about_flags.cc

@@ -1082,6 +1082,13 @@ const Experiment kExperiments[] = {
     kOsCrOS,
     SINGLE_VALUE_TYPE(chromeos::switches::kDisableQuickofficeComponentApp),
   },
+  {
+    "enable-kiosk-app-settings",
+    IDS_FLAGS_ENABLE_KIOSK_APP_SETTINGS_NAME,
+    IDS_FLAGS_ENABLE_KIOSK_APP_SETTINGS_DESCRIPTION,
+    kOsCrOSOwnerOnly,
+    SINGLE_VALUE_TYPE(chromeos::switches::kEnableKioskAppSettings),
+  },
 #endif  // defined(OS_CHROMEOS)
   {
     "views-textfield",

chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -489,6 +489,8 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
   // Sets flag of whether kiosk section should be enabled.
   values->SetBoolean(
       "enableKioskSection",
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kEnableKioskAppSettings) &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableAppMode) &&
       (chromeos::UserManager::Get()->IsCurrentUserOwner() ||

chromeos/chromeos_switches.cc

@@ -100,9 +100,14 @@ const char kEnableTouchpadThreeFingerClick[]
 const char kEnableTouchpadThreeFingerSwipe[]
     = "enable-touchpad-three-finger-swipe";
 
-// Enable Kiosk mode for ChromeOS.
+// Enable Kiosk mode for ChromeOS. Note this switch refers to retail mode rather
+// than the kiosk app mode.
 const char kEnableKioskMode[]               = "enable-kiosk-mode";
 
+// Enable kiosk app settings UI.
+// TODO(xiyuan): Remove this flag after http://crbug.com/228860.
+const char kEnableKioskAppSettings[]        = "enable-kiosk-app-settings";
+
 // Enables request of tablet site (via user agent override).
 const char kEnableRequestTabletSite[]       = "enable-request-tablet-site";
 
@@ -186,5 +191,5 @@ const char kStubCrosSettings[]              = "stub-cros-settings";
 const char kUseNewNetworkConfigurationHandlers[] =
     "use-new-network-configuration-handlers";
 
-} // namespace switches
+}  // namespace switches
 }  // namespace chromeos

chromeos/chromeos_switches.h

@@ -43,6 +43,7 @@ CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[];
 CHROMEOS_EXPORT extern const char kEnableChromeAudioSwitching[];
 CHROMEOS_EXPORT extern const char kEnableChromeCaptivePortalDetector[];
 CHROMEOS_EXPORT extern const char kEnableKioskMode[];
+CHROMEOS_EXPORT extern const char kEnableKioskAppSettings[];
 CHROMEOS_EXPORT extern const char kEnableRequestTabletSite[];
 CHROMEOS_EXPORT extern const char kEnableScreensaverExtensions[];
 CHROMEOS_EXPORT extern const char kEnableStaticIPConfig[];