Converted IncognitoForced boolean policy into IncognitoModeAvailability enum policy.

chrome/app/policy/policy_templates.json

 {
 # policy_templates.json - Metafile for policy templates
 #
 # The content of this file is evaluated as a Python expression.
 #
 # This file is used as input to generate the following policy templates:
 # ADM, ADMX+ADML, MCX/plist and html documentation.
 #
 # Policy templates are user interface definitions or documents about the
 # policies that can be used to configure Chrome. Each policy is a name-value
@@ skipping 249 matching lines @@
       'example_value': True,
       'id': 9,
       'caption': '''Enable JavaScript''',
       'desc': '''Enables JavaScript in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
 
       If this setting is enabled or not configured, web pages can use JavaScript.
 
       If this setting is disabled, web pages cannot use JavaScript.''',
     },
     {
       'name': 'IncognitoEnabled',

[Mattias Nissler (ping if slow), 2011/07/28 11:08:50]

You should mark this policy as deprecated.

[rustema, 2011/07/29 06:49:23]

Done.

       'type': 'main',
       'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
       'features': {'dynamic_refresh': 1},
       'example_value': False,
       'id': 10,
       'caption': '''Enable Incognito mode''',
       'desc': '''Enables Incognito mode in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
 
       If this setting is enabled or not configured, users can open web pages in incognito mode.
 
       If this setting is disabled, users cannot open web pages in incognito mode.''',
     },
     {
-      'name': 'IncognitoForced',
-      'type': 'main',
+      'name': 'IncognitoModeAvailability',
+      'type': 'int-enum',
+      'items': [
+        {
+          'name': 'Enabled',
+          'value': 0,
+          'caption': '''Incognito mode available.'''
+        },
+        {
+          'name': 'Disabled',
+          'value': 1,
+          'caption': '''Incognito mode disabled.'''
+        },
+        {
+          'name': 'Forced',
+          'value': 2,
+          'caption': '''Incognito mode forced.'''
+        },
+      ],
       'supported_on': ['chrome.*:14-', 'chrome_os:0.14-'],
       'features': {'dynamic_refresh': 1},
-      'example_value': False,
+      'example_value': 1,
       'id': 93,
-      'caption': '''Force Incognito mode''',
-      'desc': '''Forces every session into Incognito mode in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
+      'caption': '''Incognito mode availability.''',
+      'desc': '''Specifies whether the user may open pages in Incognito mode in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
 
-      If this setting is enabled, users can open pages only in incognito mode.
+      If 'Enabled' is selected, pages may be opened in Incognito mode.
 
-      If this setting is disabled or not configured, users can use the browser in normal mode as well.''',
+      If 'Disabled' is selected, pages may not be opened in Incognito mode.

[Mattias Nissler (ping if slow), 2011/07/28 11:08:50]

unneeded newline.

[rustema, 2011/07/29 06:49:23]

It appears to me that display is a bit broken here. In fact there's only one
empty line between lines 312 and 314.
If you meant deleting line 313, I will do it (although other policy descriptions
are formatted this way).

+
+      If 'Forced' is selected, pages may be opened ONLY in Incognito mode.''',
     },
     {
       'name': 'SavingBrowserHistoryDisabled',
       'type': 'main',
       'supported_on': ['chrome.*:8-', 'chrome_os:0.11-'],
       'features': {'dynamic_refresh': 1},
       'example_value': True,
       'id': 11,
       'caption': '''Disable saving browser history''',
       'desc': '''Disables saving browser history in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
@@ skipping 1439 matching lines @@
       'desc': '''The name of the feature that indicates for a given policy that changes to it are respected by Chrome without a browser restart''',
       'text': '''Dynamic Policy Refresh'''
     },
     'doc_deprecated': {
       'desc': '''Text appended in parentheses to the policy name to indicate t hat it has been deprecated''',
       'text': 'deprecated',
     }
   },
   'placeholders': [],
 }