Policy: Add ProxyMode and deprecate ProxyServerMode.

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 7b352aaa8181463d7a6aba3431fc5634cb0dae83..112b48b1ac337aa6673226e2b36161ed42a324d5 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -21,7 +21,10 @@
 #   'group': - not a real policy, contains a list of policies
 #     NOTE: Currently nesting groups inside other groups is not supported.
 #   'string' - a string value
-#   'enum' - the user can select its value from a collection of items
+#   'int-enum' - the user can select an integer value from a collection of 
+#     items
+#   'string-enum' - the user can select a string value from a collection of 
+#     items
 #   'main' - a boolean value
 #   'list' - a list of string values
 #
@@ -72,8 +75,8 @@
 # Currently supported product names:
 #     'chrome_frame', 'chrome_os'
 #     'chrome.win', 'chrome.linux', 'chrome.mac', 'chrome.*'
-#     For example if 'chrome.*:5-10' is specified for a policy, then it should
-#     be read as:
+#   For example if 'chrome.*:5-10' is specified for a policy, then it should
+#   be read as:
 #     'chrome.linux:5-10,chrome.mac:5-10,chrome.win:5-10'
 #   The product name also affects in which templates will the policy be included.
 #     chrome.*, chrome.win, chrome_frame -> ADM,ADMX,ADML,doc
@@ -194,9 +197,6 @@
       'annotations': {
         'features': {'dynamic_refresh': 0},
         'example_value': True,
-        'problem_href':
-          'http://www.chromium.org/administrators/'
-          'policy-list-3/metrics-reporting-enabled',
       }
     },
     {
@@ -253,15 +253,32 @@
       'type': 'group',
       'policies': [
         {
+          'name': 'ProxyMode',
+          'type': 'string-enum',
+          'items': [
+            {'name': 'ProxyDisabled', 'value': 'direct'},
+            {'name': 'ProxyAutoDetect', 'value': 'auto_detect'},
+            {'name': 'ProxyPacScript', 'value': 'pac_script'},
+            {'name': 'ProxyFixedServers', 'value': 'fixed_servers'},
+            {'name': 'ProxyUseSystem', 'value': 'system'},
+          ],
+          'supported_on': ['chrome.*:10-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 1},
+            'example_value': 'direct'
+          }
+        },
+        {
           'name': 'ProxyServerMode',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'ProxyServerDisabled', 'value': '0'},
-            {'name': 'ProxyServerAutoDetect', 'value': '1'},
-            {'name': 'ProxyServerManual', 'value': '2'},
-            {'name': 'ProxyServerUseSystem', 'value': '3'},
+            {'name': 'ProxyServerDisabled', 'value': 0},
+            {'name': 'ProxyServerAutoDetect', 'value': 1},
+            {'name': 'ProxyServerManual', 'value': 2},
+            {'name': 'ProxyServerUseSystem', 'value': 3},
           ],
           'supported_on': ['chrome.*:8-'],
+          'deprecated' : True,

[battre, 2011/01/03 13:19:16]

should we add more details:
- since when is it deprecated?
- when will it be removed?
- in API docs I like a comment like "use ProxyMode instead"

[danno, 2011/01/07 12:24:25]

I would argue that we can add more complexity to the mechanism later. We
actually don't know when this option will be removed, and I'm not sure how
important the "deprecated since" information is, since it's still supported in
all versions. There already is an additional comment in the API docs for
ProxyServerMode that ProxyMode should be used.

           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 2,
@@ -415,11 +432,11 @@
       'type': 'group',
       'policies': [{
         'name': 'RestoreOnStartup',
-        'type': 'enum',
+        'type': 'int-enum',
         'items': [
-          {'name': 'RestoreOnStartupIsNone', 'value': '0'},
-          {'name': 'RestoreOnStartupIsLastSession', 'value': '1'},
-          {'name': 'RestoreOnStartupIsURLs', 'value': '4'},
+          {'name': 'RestoreOnStartupIsNone', 'value': 0},
+          {'name': 'RestoreOnStartupIsLastSession', 'value': 1},
+          {'name': 'RestoreOnStartupIsURLs', 'value': 4},
         ],
         'supported_on': ['chrome.*:8-'],
         'annotations': {
@@ -511,10 +528,10 @@
       'policies': [
         {
           'name': 'DefaultCookiesSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowCookies', 'value': '0'},
-            {'name': 'BlockCookies', 'value': '1'},
+            {'name': 'AllowCookies', 'value': 0},
+            {'name': 'BlockCookies', 'value': 1},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
@@ -524,10 +541,10 @@
         },
         {
           'name': 'DefaultImagesSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowImages', 'value': '0'},
-            {'name': 'BlockImages', 'value': '1'},
+            {'name': 'AllowImages', 'value': 0},
+            {'name': 'BlockImages', 'value': 1},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
@@ -537,10 +554,10 @@
         },
 	{
           'name': 'DefaultJavaScriptSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowJavaScript', 'value': '0'},
-            {'name': 'BlockJavaScript', 'value': '1'},
+            {'name': 'AllowJavaScript', 'value': 0},
+            {'name': 'BlockJavaScript', 'value': 1},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
@@ -550,10 +567,10 @@
         },
 	{
           'name': 'DefaultPluginsSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowPlugins', 'value': '0'},
-            {'name': 'BlockPlugins', 'value': '1'},
+            {'name': 'AllowPlugins', 'value': 0},
+            {'name': 'BlockPlugins', 'value': 1},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
@@ -563,10 +580,10 @@
         },
 	{
           'name': 'DefaultPopupsSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowPopups', 'value': '0'},
-            {'name': 'BlockPopups', 'value': '1'},
+            {'name': 'AllowPopups', 'value': 0},
+            {'name': 'BlockPopups', 'value': 1},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
@@ -576,11 +593,11 @@
         },
         {
           'name': 'DefaultNotificationSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowNotifications', 'value': '0'},
-            {'name': 'BlockNotifications', 'value': '1'},
-            {'name': 'AskNotifications', 'value': '2'},
+            {'name': 'AllowNotifications', 'value': 0},
+            {'name': 'BlockNotifications', 'value': 1},
+            {'name': 'AskNotifications', 'value': 2},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
@@ -590,11 +607,11 @@
         },
         {
           'name': 'DefaultGeolocationSetting',
-          'type': 'enum',
+          'type': 'int-enum',
           'items': [
-            {'name': 'AllowGeolocation', 'value': '0'},
-            {'name': 'BlockGeolocation', 'value': '1'},
-            {'name': 'AskGeolocation', 'value': '2'},
+            {'name': 'AllowGeolocation', 'value': 0},
+            {'name': 'BlockGeolocation', 'value': 1},
+            {'name': 'AskGeolocation', 'value': 2},
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
@@ -619,10 +636,10 @@
       'type': 'group',
       'policies': [{
         'name': 'ChromeFrameRendererSettings',
-        'type': 'enum',
+        'type': 'int-enum',
         'items': [
-            {'name': 'RenderInHost', 'value': '0'},
-            {'name': 'RenderInChromeFrame', 'value': '1'},
+            {'name': 'RenderInHost', 'value': 0},
+            {'name': 'RenderInChromeFrame', 'value': 1},
         ],
         'supported_on': ['chrome_frame:8-'],
         'annotations': {