Policy: Add ProxyMode and deprecate ProxyServerMode.

chrome/app/policy/policy_templates.grd

Index: chrome/app/policy/policy_templates.grd
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd
index 341c57d31806cc144e5c34780ea234c047f88102..fbde638117140c8214affba645dd52c8213ce92a 100644
--- a/chrome/app/policy/policy_templates.grd
+++ b/chrome/app/policy/policy_templates.grd
@@ -285,6 +285,24 @@ templates and will be translated for each locale. -->
 
       If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> ignores all proxy-related options specified from the command line.
     </message>
+    <message name="IDS_POLICY_PROXYMODE_CAPTION" desc="Text describing the dropdown menu for selecting proxy server mode in the 'proxy' policy settings page.">
+      Choose how to specify proxy server settings
+    </message>
+    <message name="IDS_POLICY_ENUM_PROXYDISABLED_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting no proxy server.">
+      Never use a proxy
+    </message>
+    <message name="IDS_POLICY_ENUM_PROXYAUTODETECT_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting to auto-detect proxy settings.">
+      Auto detect proxy settings
+    </message>
+    <message name="IDS_POLICY_ENUM_PROXYPACSCRIPT_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting pac script proxy settings.">
+      Use a .pac proxy script
+    </message>
+    <message name="IDS_POLICY_ENUM_PROXYFIXEDSERVERS_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting fixed server proxy settings.">
+      Use a fixed proxy server

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

There can be more than one proxy server (one for http, different one for https,
etc.)

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

Done.

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

Done.

+    </message>
+    <message name="IDS_POLICY_ENUM_PROXYUSESYSTEM_CAPTION" desc="Label in the 'proxy server mode' dropdown menu for selecting to use system proxy settings.">
+      Use system proxy settings
+    </message>
     <message name="IDS_POLICY_PROXYSERVERMODE_CAPTION" desc="Text describing the dropdown menu for selecting proxy server mode in the 'proxy' policy settings page.">
       Choose how to specify proxy server settings
     </message>
@@ -312,7 +330,25 @@ templates and will be translated for each locale. -->
     <message name="IDS_POLICY_PROXYPACURL_CAPTION" desc="The label of the 'proxy pac URL' text field in the 'proxy' policy settings page.">
       URL to a proxy .pac file
     </message>
-    <message name="IDS_POLICY_PROXYSERVERMODE_DESC" desc="The description of the 'proxy bypass rules' policy when displayed in OSX Workgroup Manager.">
+    <message name="IDS_POLICY_PROXYMODE_DESC" desc="The description of the 'proxy bypass rules' policy when displayed in OSX Workgroup Manager.">

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

update the desc="..."?

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

Done.

+      Allows you to specify the proxy server used by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing proxy settings.
+
+      If you choose to never use a proxy server and always connect directly, all other options are ignored.
+
+      If you choose to use system proxy settings or auto detect the proxy server, all other options are ignored.
+
+      If you choose fixed server proxy mode, you can specify further options in 'Address or URL of proxy server' and 'Comma-separated list of proxy bypass rules'.
+
+      If you choose to use a .pac proxy script, you must specify the URL to the script in 'URL to a proxy .pac file'.
+
+      For detailed examples, visit:
+      <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
+
+      If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> ignores all proxy-related options specified from the command line.
+    </message>
+    <message name="IDS_POLICY_PROXYSERVERMODE_DESC" desc="The description of the 'proxy mode">

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

nit: missing ' after proxy mode

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

Done.

+      This policy is deprecated, use ProxyMode instead.
+
       Allows you to specify the proxy server used by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing proxy settings.
 
       If you choose to never use a proxy server and always connect directly, all other options are ignored.
@@ -857,12 +893,6 @@ templates and will be translated for each locale. -->
 
       It starts with <ph name="CHROMIUM_KEY">Software\Policies\Chromium</ph> for Chromium policies and with <ph name="GOOGLE_CHROME_KEY">Software\Policies\Google\Chrome</ph> for Google Chrome policies.
     </message>
-    <message name="IDS_POLICY_DOC_NOTE"
-             desc="Warning notice for policies in the generated policy documentation">
-      NOTE: there are some issues about this policy, visit
-      <ph name="POLICY_TEMPLATE_DOWNLOAD_URL">$6<ex>
-        http://www.chromium.org/administrators/policy-list-3/serious-problem</ex></ph> for more details.

[gfeher, 2011/01/03 10:30:10]

Please don't remove this. There is still code in doc_writer.py that uses this
text, it's just currently not triggered from the JSON file. I'd be more happy if
you would create a separate bug for cleaning this up.

-    </message>
     <message name="IDS_POLICY_DOC_BACK_TO_TOP"
              desc="Text of a link in the generated policy documentation, that takes the user to the top of the page">
       Back to top