diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/policy/policy_templates.grd | 52 | ||||
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 23 | ||||
| -rw-r--r-- | chrome/browser/policy/configuration_policy_store.h | 3 | ||||
| -rw-r--r-- | chrome/common/policy_constants.cc | 5 | ||||
| -rw-r--r-- | chrome/common/policy_constants.h | 5 |
5 files changed, 88 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' + }, ] } diff --git a/chrome/browser/policy/configuration_policy_store.h b/chrome/browser/policy/configuration_policy_store.h index 05e07a0..ee7d1262 100644 --- a/chrome/browser/policy/configuration_policy_store.h +++ b/chrome/browser/policy/configuration_policy_store.h @@ -41,6 +41,9 @@ class ConfigurationPolicyStore { kPolicyShowHomeButton, kPolicyDisabledPlugins, kPolicyPrintingEnabled, + kPolicyChromeFrameRendererSettings, + kPolicyRenderInChromeFrameList, + kPolicyRenderInHostList, }; static const int kPolicyNoProxyServerMode = 0; diff --git a/chrome/common/policy_constants.cc b/chrome/common/policy_constants.cc index 2fc0ba6..2dfc376 100644 --- a/chrome/common/policy_constants.cc +++ b/chrome/common/policy_constants.cc @@ -41,6 +41,11 @@ const char kExtensionInstallDenyList[] = "ExtensionInstallBlacklist"; const char kShowHomeButton[] = "ShowHomeButton"; const char kPrintingEnabled[] = "PrintingEnabled"; +// Chrome Frame specific policy constants +const char kChromeFrameRendererSettings[] = "ChromeFrameRendererSettings"; +const char kRenderInChromeFrameList[] = "RenderInChromeFrameList"; +const char kRenderInHostList[] = "RenderInHostList"; + } // namespace key } // namespace policy diff --git a/chrome/common/policy_constants.h b/chrome/common/policy_constants.h index 252077a..1e775b0 100644 --- a/chrome/common/policy_constants.h +++ b/chrome/common/policy_constants.h @@ -42,6 +42,11 @@ extern const char kExtensionInstallDenyList[]; extern const char kShowHomeButton[]; extern const char kPrintingEnabled[]; +// Chrome Frame specific policy constants +extern const char kChromeFrameRendererSettings[]; +extern const char kRenderInChromeFrameList[]; +extern const char kRenderInHostList[]; + } // namespace key } // namespace policy |