summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 04:59:33 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 04:59:33 +0000
commitd2177996db8711c972258e43d70ed90252170441 (patch)
treeb1b429d627c690cae7592dad0381e42119537917 /chrome/app
parent579d1d72c29c72735a6decf2e6f5759809d74d75 (diff)
downloadchromium_src-d2177996db8711c972258e43d70ed90252170441.zip
chromium_src-d2177996db8711c972258e43d70ed90252170441.tar.gz
chromium_src-d2177996db8711c972258e43d70ed90252170441.tar.bz2
Add policy support for Chrome Frame. New Chrome Frame messages added to th json and grd files that are used to generate the policy templates.
Added matching constants for the policy elements to the policy_constants files. Added support for a new template value, $3, that represents the Chrome Frame product name in policy templates. TEST=none BUG=29349 Review URL: http://codereview.chromium.org/3325011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/policy/policy_templates.grd52
-rw-r--r--chrome/app/policy/policy_templates.json23
2 files changed, 75 insertions, 0 deletions
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd
index 8c2adcc..1d5a259 100644
--- a/chrome/app/policy/policy_templates.grd
+++ b/chrome/app/policy/policy_templates.grd
@@ -470,6 +470,58 @@ templates and will be translated for each locale. -->
<message name="IDS_POLICY_RESTOREONSTARTUPURLS_DESC" desc="Description of the list editor 'restore startup urls' of the policy settings page 'restore on startup'.">
If 'Open a list of URLs' is selected as action on startup, this allows you to specify the list of URLs that are opened on startup.
</message>
+
+ <!-- Begin Chrome Frame messages -->
+ <message name="IDS_POLICY_GROUP_CHROMEFRAMERENDERERSETTINGS_CAPTION"
+ desc="Caption of Chrome Frame renderer policy settings page">
+ Configure the default renderer for <ph name="PRODUCT_FRAME_NAME">$3<ex>
+ Google Chrome Frame</ex></ph>
+ </message>
+ <message name="IDS_POLICY_GROUP_CHROMEFRAMERENDERERSETTINGS_DESC"
+ desc="Description of the 'Chrome Frame renderer' policy settings page. TODO(gfeher): This text is only visible on Mac, but the corresponding policy is not supported on Mac.">
+ Configure the default HTML renderer when <ph name="PRODUCT_FRAME_NAME">
+ $3<ex>Google Chrome Frame</ex>
+ </ph> is installed.
+ The default setting is to allow the host browser do the rendering, but you can optionally override this and have <ph name="PRODUCT_FRAME_NAME">$3<ex>
+ Google Chrome Frame</ex></ph> render HTML pages by default.
+ For example patterns for the lists, see <ph name="CF_GETTING_STARTED_URL">$4<ex>
+ http://www.chromium.org/developers/how-tos/chrome-frame-getting-started</ex></ph>.
+ </message>
+
+ <message name="IDS_POLICY_CHROMEFRAMERENDERERSETTINGS_CAPTION"
+ desc="Caption of Chrome Frame renderer policy settings page">
+ Configure the default HTML renderer for <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph>
+ </message>
+ <message name="IDS_POLICY_CHROMEFRAMERENDERERSETTINGS_DESC"
+ desc="Description of the 'Chrome Frame renderer' policy settings page.">
+ Allows you to configure the default HTML renderer when <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex>
+ </ph> is installed.
+ The default setting is to allow the host browser do the rendering, but you
+ can optionally override this and have <ph name="PRODUCT_FRAME_NAME">$3<ex>
+ Google Chrome Frame</ex></ph> render HTML pages by default.
+ </message>
+
+ <message name="IDS_POLICY_ENUM_RENDERINHOST_CAPTION"
+ desc="Caption for 'Use the host browser as the default HTML renderer'.">
+ Use the host browser by default
+ </message>
+
+ <message name="IDS_POLICY_ENUM_RENDERINCHROMEFRAME_CAPTION"
+ desc="Make Chrome Frame the default renderer - caption">
+ Use <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> by default
+ </message>
+
+ <message name="IDS_POLICY_RENDERINCHROMEFRAMELIST_CAPTION"
+ desc="Caption for list of URLs that should always be displayed in Chrome Frame">
+ Always render the following URL patterns in <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph>
+ </message>
+
+ <message name="IDS_POLICY_RENDERINHOSTLIST_CAPTION"
+ desc="Caption for list of URLs that should always be displayed in the host browser">
+ Always render the following URL patterns in the host browser
+ </message>
+ <!-- End Chrome Frame messages -->
+
</messages>
</release>
</grit>
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index fe84664..5d96131 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -233,11 +233,34 @@
'type': 'list',
}]
},
+ {
+ 'name': 'ChromeFrameRendererSettings',
+ 'policies': [{
+ 'name': 'ChromeFrameRendererSettings',
+ 'type': 'enum',
+ 'items': [
+ {'name': 'RenderInHost', 'value': '0'},
+ {'name': 'RenderInChromeFrame', 'value': '1'},
+ ],
+ }, {
+ 'name': 'RenderInChromeFrameList',
+ 'type': 'list',
+ }, {
+ 'name': 'RenderInHostList',
+ 'type': 'list',
+ },
+ ],
+ },
],
'placeholders': [
+ # Note: keys $1 and $3 are reserved for Chromium and Chromium Frame.
{
'key': '$2',
'value': 'http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett'
},
+ {
+ 'key': '$4',
+ 'value': 'http://www.chromium.org/developers/how-tos/chrome-frame-getting-started'
+ },
]
}