Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Unified Diff: content/browser/ppapi_plugin_process_host.cc

Issue 374773002: Remove GTalk/O1D plugins and related code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/chrome_paths.cc ('k') | content/common/pepper_plugin_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/ppapi_plugin_process_host.cc
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index f5756b1aa0e113f0479c088ab05279bc0f234c60..fe10276f7102357d551e997320b0b122236e1e8f 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -74,7 +74,7 @@ class PpapiPluginSandboxedProcessLauncherDelegate
*base::CommandLine::ForCurrentProcess();
base::CommandLine::StringType plugin_launcher = browser_command_line
.GetSwitchValueNative(switches::kPpapiPluginLauncher);
- return !is_broker_ && plugin_launcher.empty() && info_.is_sandboxed;
+ return !is_broker_ && plugin_launcher.empty();
}
base::ScopedFD TakeIpcFd() override { return ipc_fd_.Pass(); }
#endif // OS_WIN
@@ -377,13 +377,8 @@ bool PpapiPluginProcessHost::Init(const PepperPluginInfo& info) {
cmd_line->PrependWrapper(plugin_launcher);
// On posix, never use the zygote for the broker. Also, only use the zygote if
- // the plugin is sandboxed, and we are not using a plugin launcher - having a
- // plugin launcher means we need to use another process instead of just
- // forking the zygote.
-#if defined(OS_POSIX)
- if (!info.is_sandboxed)
- cmd_line->AppendSwitchASCII(switches::kNoSandbox, std::string());
-#endif // OS_POSIX
+ // we are not using a plugin launcher - having a plugin launcher means we need
+ // to use another process instead of just forking the zygote.
process_->Launch(
new PpapiPluginSandboxedProcessLauncherDelegate(is_broker_,
info,
« no previous file with comments | « chrome/common/chrome_paths.cc ('k') | content/common/pepper_plugin_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698