summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 14:32:01 +0000
committermarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 14:32:01 +0000
commit446c9df29b0dc6527ec490c13c207bc3bd94d469 (patch)
tree249c673bf1d36aca55a7df40a7d5d2fedde14b2e /chrome
parent0138b4a799f9a40992c6f8ea5a43bf40f8a620f0 (diff)
downloadchromium_src-446c9df29b0dc6527ec490c13c207bc3bd94d469.zip
chromium_src-446c9df29b0dc6527ec490c13c207bc3bd94d469.tar.gz
chromium_src-446c9df29b0dc6527ec490c13c207bc3bd94d469.tar.bz2
ADMX/ADML Writer to generate ADMX/ADMl templates.
BUG=53315 TEST=manual Review URL: http://codereview.chromium.org/3162030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/policy/policy_templates.grd36
-rw-r--r--chrome/app/policy/policy_templates.json18
-rw-r--r--chrome/chrome.gyp4
3 files changed, 54 insertions, 4 deletions
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd
index fbf3581..383243c 100644
--- a/chrome/app/policy/policy_templates.grd
+++ b/chrome/app/policy/policy_templates.grd
@@ -6,6 +6,8 @@ templates and will be translated for each locale. -->
<grit base_dir="." latest_public_release="0" current_release="1"
source_lang_id="en" enc_check="möl">
<outputs>
+ <output filename="app/policy/windows/admx/chrome.admx" type="admx" lang="en" />
+ <output filename="app/policy/windows/admx/en-US/chrome.adml" type="adml" lang="en" />
<output filename="app/policy/windows/adm/am/chrome.adm" type="adm" lang="am" />
<output filename="app/policy/windows/adm/ar/chrome.adm" type="adm" lang="ar" />
<output filename="app/policy/windows/adm/bg/chrome.adm" type="adm" lang="bg" />
@@ -265,6 +267,40 @@ templates and will be translated for each locale. -->
If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
</message>
+ <message name="IDS_POLICY_GROUP_AUTOFILLENABLED_CAPTION" desc="Caption of
+ the 'autofill' policy settings page.">
+ Enable AutoFill
+ </message>
+ <message name="IDS_POLICY_GROUP_AUTOFILLENABLED_DESC" desc="Description of
+ the 'autofill' policy settings page.">
+ Enables <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s AutoFill
+ feature and allows users to auto-complete web-forms using previously stored
+ information like address or credit card information.
+
+ If you enable this setting, AutoFill is always active.
+
+ If you disable this setting, AutoFill is never active.
+
+ If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
+ </message>
+
+ <message name="IDS_POLICY_GROUP_SHOWHOMEBUTTON_CAPTION" desc="Caption of
+ the 'show Home button' policy settings page.">
+ Show Home button on toolbar
+ </message>
+ <message name="IDS_POLICY_GROUP_SHOWHOMEBUTTON_DESC" desc="Description of
+ the 'show Home button' policy settings page.">
+ Shows the Home button on <ph name="PRODUCT_NAME">$1<ex>Google
+ Chrome</ex></ph>'s toolbar.
+
+ If you enable this setting, the Home button is always shown.
+
+ If you disable this setting, the Home button is never shown.
+
+ If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
+
+ </message>
+
<message name="IDS_POLICY_GROUP_SAFEBROWSINGENABLED_CAPTION" desc="Caption of the 'safe browsing' policy settings page.">
Enable Safe Browsing
</message>
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index e44ac69..5d15aca 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -147,6 +147,13 @@
}]
},
{
+ 'name' : 'AutoFillEnabled',
+ 'policies': [{
+ 'name': 'AutoFillEnabled',
+ 'type': 'main',
+ }]
+ },
+ {
'name': 'DisabledPlugins',
'policies': [{
'name': 'DisabledPluginsList',
@@ -200,7 +207,14 @@
'name': 'ExtensionInstallWhitelist',
'type': 'list',
}]
- }
+ },
+ {
+ 'name': 'ShowHomeButton',
+ 'policies': [{
+ 'name': 'ShowHomeButton',
+ 'type': 'main',
+ }]
+ },
],
'placeholders': [
{
@@ -208,4 +222,4 @@
'value': 'http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett'
},
]
-} \ No newline at end of file
+}
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index e9ecaa4..6d67921 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1802,7 +1802,7 @@
},
]}, # 'targets'
], # OS=="win"
- ['OS=="win" or OS=="mac"',
+ ['OS=="win" or OS=="mac" or OS=="linux"',
{ 'targets': [
{
# policy_templates has different inputs and outputs, so it can't use
@@ -1863,7 +1863,7 @@
],
},
]}, # 'targets'
- ], # OS=="win" or OS=="mac"
+ ], # OS=="win" or OS=="mac" or OS=="linux"
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'targets': [{
'target_name': 'packed_resources',