summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-09 00:18:02 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-09 00:18:02 +0000
commit3bbd548aa05e5190ea1f33a67ee1bced2a04df60 (patch)
treece08b73abca646c660cdc0ecdfb66809331ba9ea /content
parent6f627704600a99e705aa2d01062fa64cfa6ea935 (diff)
downloadchromium_src-3bbd548aa05e5190ea1f33a67ee1bced2a04df60.zip
chromium_src-3bbd548aa05e5190ea1f33a67ee1bced2a04df60.tar.gz
chromium_src-3bbd548aa05e5190ea1f33a67ee1bced2a04df60.tar.bz2
Fix r77364: Forward new PPAPI Flash flags on to the renderer.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6647006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/zygote_host_linux.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/browser/zygote_host_linux.cc b/content/browser/zygote_host_linux.cc
index 3b6f1fb..4b8d76c 100644
--- a/content/browser/zygote_host_linux.cc
+++ b/content/browser/zygote_host_linux.cc
@@ -101,6 +101,8 @@ 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::kPpapiFlashPath,
+ switches::kPpapiFlashVersion,
switches::kRegisterPepperPlugins,
switches::kDisableSeccompSandbox,
switches::kEnableSeccompSandbox,