summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/policy/policy_templates.grd42
-rw-r--r--chrome/app/policy/policy_templates.json96
2 files changed, 99 insertions, 39 deletions
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd
index b665271..2fa2016 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 fixed proxy servers
+ </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 mode' policy when displayed in OSX Workgroup Manager.">
+ 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 server mode'">
+ 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.
@@ -867,6 +903,10 @@ templates and will be translated for each locale. -->
desc="Text of a link in the generated policy documentation, that takes the user to the top of the page">
Back to top
</message>
+ <message name="IDS_POLICY_DOC_DEPRECATED"
+ desc="Text appended in parentheses to the policy name to indicate that it has been deprecated">
+ deprecated
+ </message>
<message name="IDS_POLICY_DOC_SUPPORTED"
desc="Appears next to the name of each supported feature in the 'list of supported policy features' in the generated policy documentation">
Yes
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index 274e00a..2b7d4b3 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
@@ -250,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,
'annotations': {
'features': {'dynamic_refresh': 1},
'example_value': 2,
@@ -412,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': {
@@ -517,10 +537,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': {
@@ -530,10 +550,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': {
@@ -543,10 +563,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': {
@@ -556,10 +576,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': {
@@ -569,10 +589,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': {
@@ -582,11 +602,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': {
@@ -596,11 +616,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': {
@@ -625,10 +645,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': {
generated by cgit v1.1 at 2025-02-07 12:07:33 +0000