diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 21:24:45 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 21:24:45 +0000 |
| commit | f553c3826590d980973269d17be1f09e075f98af (patch) | |
| tree | 8b776d47367becdb4a8941fd7f2bdaab3ec9e239 /chrome/app/policy | |
| parent | 865394df590aabeeb15db51ac159f165fd6d9c9c (diff) | |
| download | chromium_src-f553c3826590d980973269d17be1f09e075f98af.zip chromium_src-f553c3826590d980973269d17be1f09e075f98af.tar.gz chromium_src-f553c3826590d980973269d17be1f09e075f98af.tar.bz2 | |
Added group policy for disabling all client-side 3D APIs in Chromium
(in particular, WebGL and Pepper 3D). This has been hooked up through
a new command-line argument (--disable-3d-apis) orthogonal to the
existing ones, so that further changes to those command line arguments
will not accidentally regress the group policy support.
Tested in the following ways:
- Verified that --disable-3d-apis disables WebGL and Pepper 3D
support on Mac OS X.
- Verified that specifying the Disable3DAPIs policy via a JSON file
disables WebGL on Linux.
- Ran unit_tests and verified that there were no failures introduced.
BUG=64806
TEST=ConfigurationPolicyPrefStoreBooleanTest
Review URL: http://codereview.chromium.org/5991003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy')
| -rw-r--r-- | chrome/app/policy/policy_templates.grd | 10 | ||||
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd index 39d0545..341c57d 100644 --- a/chrome/app/policy/policy_templates.grd +++ b/chrome/app/policy/policy_templates.grd @@ -726,6 +726,16 @@ templates and will be translated for each locale. --> <message name="IDS_POLICY_DEFAULTSEARCHPROVIDERENCODINGS_DESC" desc="Caption of the 'Encodings' text field in the 'Default Search Provider' policy settings page."> Specifies the character encodings supported by the search provider. Encodings are code page names like UTF-8, GB2312, and ISO-8859-1. They are tried in the order provided. The default is UTF-8. </message> + <message name="IDS_POLICY_DISABLE3DAPIS_CAPTION" desc="Label of the Disable3DAPIs policy text field."> + Disable support for 3D graphics APIs + </message> + <message name="IDS_POLICY_DISABLE3DAPIS_DESC" desc="Caption of the Disable3DAPIs policy text field."> + Disable support for 3D graphics APIs. + + Enabling this setting prevents web pages from accessing the graphics processing unit (GPU). Specifically, web pages can not access the WebGL API and plugins can not use the Pepper 3D API. + + Disabling this setting potentially allows web pages to use the WebGL API and plugins to use the Pepper 3D API. The default settings of the browser may still require command line arguments to be passed in order to use these APIs. + </message> <!-- Begin Chrome Frame messages --> <message name="IDS_POLICY_CHROMEFRAMERENDERERSETTINGS_CAPTION" desc="Caption of Chrome Frame renderer policy group"> diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index 59a4e15..b11a61d 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -506,6 +506,16 @@ ] }, { + 'name': 'Disable3DAPIs', + 'type': 'main', + 'supported_on': ['chrome.*:9-'], + 'annotations': { + # It'll be difficult to support dynamically disabling access to these APIs. + 'features': {'dynamic_refresh': 0}, + 'example_value': False, + } + }, + { 'name': 'ContentSettings', 'type': 'group', 'policies': [ |