From 30fc7a827148fe22782fc8202e9c8602d1448a01 Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Tue, 24 May 2011 23:12:32 +0000 Subject: Don't terminate plugin processes from the browser during browser shutdown. This is to allow the plugins to shutdown gracefully, i.e. NP_Shutdown gets called. To ensure that we handle the case of a hung plugin, we handle the OnChannelError notification in the IPC message filter implementation in the plugin process and post a delayed task to kill the process. Fixes bug http://code.google.com/p/chromium/issues/detail?id=48178 BUG=48178 Review URL: http://codereview.chromium.org/6992006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86517 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/browser_child_process_host.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'content/browser/browser_child_process_host.h') diff --git a/content/browser/browser_child_process_host.h b/content/browser/browser_child_process_host.h index 07bc44d..61e7981 100644 --- a/content/browser/browser_child_process_host.h +++ b/content/browser/browser_child_process_host.h @@ -92,6 +92,10 @@ class BrowserChildProcessHost : public ChildProcessHost, // the host list. Calls ChildProcessHost::ForceShutdown virtual void ForceShutdown(); + // Controls whether the child process should be terminated on browser + // shutdown. Default is to always terminate. + void SetTerminateChildOnShutdown(bool terminate_on_shutdown); + private: // By using an internal class as the ChildProcessLauncher::Client, we can // intercept OnProcessLaunched and do our own processing before -- cgit v1.1