diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 23:07:40 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 23:07:40 +0000 |
| commit | 5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512 (patch) | |
| tree | cff9275bd93bc02c09e2d9836a82b086745a9852 /chrome/app/policy | |
| parent | 10da830b7fe028f85cf2167fadb64852cfe526ee (diff) | |
| download | chromium_src-5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512.zip chromium_src-5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512.tar.gz chromium_src-5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512.tar.bz2 | |
Policy support for being able to specify a list of content types that Chrome Frame should handle.
TEST=This adds a new policy list for Chrome Frame, "ChromeFrameContentTypes", which can be used to specify a list of content types that should always be rendered in Chrome Frame.
BUG=56543
Review URL: http://codereview.chromium.org/3611002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy')
| -rw-r--r-- | chrome/app/policy/policy_templates.grd | 9 | ||||
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 14 |
2 files changed, 23 insertions, 0 deletions
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd index d7316c2..0b154e46 100644 --- a/chrome/app/policy/policy_templates.grd +++ b/chrome/app/policy/policy_templates.grd @@ -523,6 +523,15 @@ templates and will be translated for each locale. --> Customize the list of URL patterns that should always be rendered by the host browser. For example patterns see http://www.chromium.org/developers/how-tos/chrome-frame-getting-started. </message> + + <message name="IDS_POLICY_CHROMEFRAMECONTENTTYPES_CAPTION" + desc="Caption for list of Content-Type values that should additionally be supported by Chrome Frame"> + Allow <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> to handle the following content types. + </message> + <message name="IDS_POLICY_CHROMEFRAMECONTENTTYPES_DESC" + desc="Description for list of Content-Type values that should additionally be supported by Chrome Frame"> + Allow <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> to handle the following content types. + </message> <!-- End Chrome Frame messages --> <!-- Generated documentation messages --> diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index 127fbd8..7d95cf7 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -390,6 +390,20 @@ } }], }, + { + 'name': 'ChromeFrameContentTypes', + 'type': 'group', + 'policies': [{ + 'name': 'ChromeFrameContentTypes', + 'type': 'list', + 'annotations': { + 'platforms': ['win'], + 'products': ['chrome_frame'], + 'features': {'dynamic_refresh': 0}, + 'example_value': ['text/xml', 'application/xml'], + } + }], + }, ], 'placeholders': [ # Note: keys $1 and $3 are reserved for Chromium and Chromium Frame. |