summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-01 18:19:30 +0000
committerpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-01 18:19:30 +0000
commitf2d3ce0dc513f6eb62bf9ba530e75aadde27791c (patch)
tree98dc4bbe34e261a00341513fe2b2c8c0be52421a /content/browser
parent97e64b16ad6bda9bd75bba13057cc6a14f8ac4a0 (diff)
downloadchromium_src-f2d3ce0dc513f6eb62bf9ba530e75aadde27791c.zip
chromium_src-f2d3ce0dc513f6eb62bf9ba530e75aadde27791c.tar.gz
chromium_src-f2d3ce0dc513f6eb62bf9ba530e75aadde27791c.tar.bz2
Fix out-of-process pepper plugins when sandbox is on.
Also make --ppapi-flash-in-process accessible and useful on Chrome OS. BUG=none TEST=check in about:flags on Chrome OS, go to youtube on Chrome OS, with or without the flag. Review URL: http://codereview.chromium.org/6764003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/zygote_host_linux.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/browser/zygote_host_linux.cc b/content/browser/zygote_host_linux.cc
index a14a036..4a51436 100644
--- a/content/browser/zygote_host_linux.cc
+++ b/content/browser/zygote_host_linux.cc
@@ -102,6 +102,7 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) {
switches::kVModule,
switches::kUserDataDir, // Make logs go to the right file.
// Load (in-process) Pepper plugins in-process in the zygote pre-sandbox.
+ switches::kPpapiFlashInProcess,
switches::kPpapiFlashPath,
switches::kPpapiFlashVersion,
switches::kRegisterPepperPlugins,