diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-16 15:17:15 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-16 15:18:37 +0000 |
| commit | ac1e49eb6695f711d72215fcdf9388548942a00d (patch) | |
| tree | 88c78e7d66603996cf0dc78d7676b11d57a305bd /chrome/common/policy_constants.cc | |
| parent | dac52a1b6f0c401bccca1e5713f782a8b26345b3 (diff) | |
| download | external_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.zip external_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.tar.gz external_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.tar.bz2 | |
Merge Chromium at 9.0.597.69: Trivial merge by Git.
/branches/597/src@71538
Change-Id: Id9fad65a5e6d2ab901d9c8bff6dbf96ab7977f36
Diffstat (limited to 'chrome/common/policy_constants.cc')
| -rw-r--r-- | chrome/common/policy_constants.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/common/policy_constants.cc b/chrome/common/policy_constants.cc index 36e6874..42efba9 100644 --- a/chrome/common/policy_constants.cc +++ b/chrome/common/policy_constants.cc @@ -69,6 +69,7 @@ const char kEnableAuthNegotiatePort[] = "EnableAuthNegotiatePort"; const char kAuthServerWhitelist[] = "AuthServerWhitelist"; const char kAuthNegotiateDelegateWhitelist[] = "AuthNegotiateDelegateWhitelist"; const char kGSSAPILibraryName[] = "GSSAPILibraryName"; +const char kDisable3DAPIs[] = "Disable3DAPIs"; // Chrome Frame specific policy constants const char kChromeFrameRendererSettings[] = "ChromeFrameRendererSettings"; |