diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 04:57:11 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 04:57:11 +0000 |
| commit | f8116b6fd136c5c86eaaede373b0363e77e08646 (patch) | |
| tree | 306ada741c05564cccbb5f975b0feb32b08dfa07 /content | |
| parent | 7e96e345351108e7abf5dcc405292236f2188963 (diff) | |
| download | chromium_src-f8116b6fd136c5c86eaaede373b0363e77e08646.zip chromium_src-f8116b6fd136c5c86eaaede373b0363e77e08646.tar.gz chromium_src-f8116b6fd136c5c86eaaede373b0363e77e08646.tar.bz2 | |
Minor tree-fixing follow-ups for the executable-heap/no-PIE fix (r97984).
BUG=90221, 93551
TEST=everything
Review URL: http://codereview.chromium.org/7718023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/ppapi_plugin_process_host.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index 7108f02..a64f7fa 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -41,7 +41,13 @@ bool PpapiPluginProcessHost::Init(const PepperPluginInfo& info) { CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); - FilePath exe_path = ChildProcessHost::GetChildPath(plugin_launcher.empty()); +#if defined(OS_LINUX) + int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : + ChildProcessHost::CHILD_NORMAL; +#else + int flags = ChildProcessHost::CHILD_NORMAL; +#endif + FilePath exe_path = ChildProcessHost::GetChildPath(flags); if (exe_path.empty()) return false; |