Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / components / policy / resources / policy_templates.json

diff --git a/src/components/policy/resources/policy_templates.json b/src/components/policy/resources/policy_templates.json
index 8e7b1fb..e8c16d2 100644 (file)
--- a/src/components/policy/resources/policy_templates.json
+++ b/src/components/policy/resources/policy_templates.json
@@ -118,7 +118,7 @@
 #   persistent IDs for all fields (but not for groups!) are needed. These are
 #   specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
 #   because doing so would break the deployed wire format!
-#   For your editing convenience: highest ID currently used: 262
+#   For your editing convenience: highest ID currently used: 265
 #
 # Placeholders:
 #   The following placeholder strings are automatically substituted:
@@ -309,7 +309,7 @@
       If this policy is left not set, this will be enabled but the user will be able to change it.''',
     },
     {
-      'name': 'QuickCheckEnabled',
+      'name': 'WPADQuickCheckEnabled',
       'type': 'main',
       'schema': { 'type': 'boolean' },
       'supported_on': [ 'chrome.*:35-', 'chrome_os:35-' ],
@@ -971,6 +971,27 @@
       If you set this policy, you can configure if a user is allowed to sign in to <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> or not.''',
     },
     {
+      'name': 'EnableWebBasedSignin',
+      'type': 'main',
+      'schema': { 'type': 'boolean' },
+      'supported_on': ['chrome.*:35-'],
+      'features': {
+        'dynamic_refresh': False,
+        'per_profile': False,
+      },
+      'future': True,
+      'example_value': False,
+      'id': 265,
+      'caption': '''Enables the old web-based signin''',
+      'desc': '''Enables the old web-based signin flow.
+
+      This setting is useful for enterprise customers who are using SSO solutions that are not compatible with the new inline signin flow yet.
+      If you enable this setting, the old web-based signin flow would be used.
+      If you disable this setting or leave it not set, the new inline signin flow would be used by default. Users may still enable the old web-based signin flow through the command line flag --enable-web-based-signin.
+
+      The experimental setting will be removed in the future when the inline signin fully supports all SSO signin flows.''',
+    },
+    {
       'name': 'UserDataDir',
       'type': 'string',
       'schema': { 'type': 'string' },