Converted IncognitoForced boolean policy into IncognitoModeAvailability enum policy.

chrome/app/policy/policy_templates.json

Index: chrome/app/policy/policy_templates.json
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index 59d9950e4388232301b07f6daf2d1cbfd7c16371..b8b0cb7a226964b399d409ee6c93a01cfbaaceef 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -281,18 +281,37 @@
       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 'Enabled' is selected, pages may be opened in Incognito mode.
 
-      If this setting is enabled, users can open pages only in incognito mode.
+      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 this setting is disabled or not configured, users can use the browser in normal mode as well.''',
+      If 'Forced' is selected, pages may be opened ONLY in Incognito mode.''',
     },
     {
       'name': 'SavingBrowserHistoryDisabled',