summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_switches.cc
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 21:24:45 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 21:24:45 +0000
commitf553c3826590d980973269d17be1f09e075f98af (patch)
tree8b776d47367becdb4a8941fd7f2bdaab3ec9e239 /chrome/common/chrome_switches.cc
parent865394df590aabeeb15db51ac159f165fd6d9c9c (diff)
downloadchromium_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/common/chrome_switches.cc')
-rw-r--r--chrome/common/chrome_switches.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 84236bb..7a64479 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -139,6 +139,12 @@ const char kDeviceManagementUrl[] = "device-management-url";
// Triggers a pletora of diagnostic modes.
const char kDiagnostics[] = "diagnostics";
+// Disables client-visible 3D APIs, in particular WebGL and Pepper 3D.
+// This is controlled by policy and is kept separate from the other
+// enable/disable switches to avoid accidentally regressing the policy
+// support for controlling access to these APIs.
+const char kDisable3DAPIs[] = "disable-3d-apis";
+
// Disables accelerated compositing.
const char kDisableAcceleratedCompositing[] =
"disable-accelerated-compositing";