diff options
| author | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 15:49:22 +0000 |
|---|---|---|
| committer | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 15:49:22 +0000 |
| commit | 2ff94fdf547169086f91a86cbbf7e1accedadd5f (patch) | |
| tree | 6a3abdb4ac9bf5395905b3d2caffa57fd038398a /chrome/app/policy/policy_templates.grd | |
| parent | 4453c26ac93a402f617c88ba777769ccceb491b4 (diff) | |
| download | chromium_src-2ff94fdf547169086f91a86cbbf7e1accedadd5f.zip chromium_src-2ff94fdf547169086f91a86cbbf7e1accedadd5f.tar.gz chromium_src-2ff94fdf547169086f91a86cbbf7e1accedadd5f.tar.bz2 | |
Generate example JSON policy configuration files
Also fix filtering of single (non-groupped) policies by platforms.
BUG=56531
TEST=JsonWriterUnittest.*,PolicyTemplateGeneratorUnittest.testPolicyFiltering
Review URL: http://codereview.chromium.org/4164006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy/policy_templates.grd')
| -rw-r--r-- | chrome/app/policy/policy_templates.grd | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd index a4d5d97..4176287 100644 --- a/chrome/app/policy/policy_templates.grd +++ b/chrome/app/policy/policy_templates.grd @@ -10,6 +10,7 @@ templates and will be translated for each locale. --> <output filename="app/policy/windows/admx/en-US/chrome.adml" type="adml" lang="en" /> <output filename="app/policy/common/html/chrome_policy_list.html" type="doc" lang="en" /> <output filename="app/policy/windows/adm/en-US/chrome.adm" type="adm" lang="en" /> + <output filename="app/policy/linux/chrome.json" type="json" lang="en" /> <if expr="os == 'darwin'"> <output filename="app/policy/mac/app-Manifest.plist" type="plist" lang="en" /> @@ -177,7 +178,7 @@ templates and will be translated for each locale. --> </message> <message name="IDS_POLICY_DISABLESPDY_DESC" desc="Description of the 'Disable SPDY' policy."> Disables use of the SPDY protocol in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. - </message> + </message> <message name="IDS_POLICY_JAVASCRIPTENABLED_CAPTION" desc="Caption of the 'JavaScript enabled' policy settings page."> Enable JavaScript |