summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_switches.cc
diff options
context:
space:
mode:
authorsehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 03:21:14 +0000
committersehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 03:21:14 +0000
commitd2139663640f674e7c56b1e139616c62c2b58885 (patch)
tree9afede65658f12bd00bf6cbf416a66e33c7737f1 /chrome/common/chrome_switches.cc
parent665112a28e524eed5892bc1eebb453ae3f0d64c3 (diff)
downloadchromium_src-d2139663640f674e7c56b1e139616c62c2b58885.zip
chromium_src-d2139663640f674e7c56b1e139616c62c2b58885.tar.gz
chromium_src-d2139663640f674e7c56b1e139616c62c2b58885.tar.bz2
Re-enable the build of Pepper support by default (issue 464074, svn revision 34161).
There were problems building Skia and others for the 64-bit linux versions of the Pepper test plugin, so I have disabled building that plugin except on Windows for now and added a TODO. One significant addition to the previous comment lines. The flag enable_gpu=1 now causes the build definition ENABLE_GPU=1 to allow guarding of dependent code. BUG=none TEST=none Review URL: http://codereview.chromium.org/481001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_switches.cc')
-rw-r--r--chrome/common/chrome_switches.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 3160bd8..f64b451 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -313,6 +313,9 @@ const char kIncognito[] = "incognito";
// Runs the Native Client inside the renderer process.
const char kInternalNaCl[] = "internal-nacl";
+// Runs a trusted Pepper plugin inside the renderer process.
+const char kInternalPepper[] = "internal-pepper";
+
// Specifies the flags passed to JS engine
const char kJavaScriptFlags[] = "js-flags";