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-09 17:19:22 +0000
committersehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-09 17:19:22 +0000
commit5f6397ecb4c7bc92295adc8d21bd87e698ac5622 (patch)
tree140bdcb6f5680147521296fabd1dafcb9159a892 /chrome/common/chrome_switches.cc
parente5307cef6dcdc2ab5d4445cd57938dbf4d5e30c3 (diff)
downloadchromium_src-5f6397ecb4c7bc92295adc8d21bd87e698ac5622.zip
chromium_src-5f6397ecb4c7bc92295adc8d21bd87e698ac5622.tar.gz
chromium_src-5f6397ecb4c7bc92295adc8d21bd87e698ac5622.tar.bz2
Enable Pepper support by default, including building the test plugin.
This is needed because the NaCl plugin code that runs in the renderer needs to use Pepper APIs all the time, and NaCl support has been enabled by default for several months now. To cause an untrusted Pepper plugin to run in the renderer one needs to specify the --internal-pepper flag. I have also removed the enable_pepper flag from gyp. As the build of the GPU process was tied to this flag, I have renamed the flag to enable_gpu. TEST=none BUG=none Review URL: http://codereview.chromium.org/464074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34161 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";