summaryrefslogtreecommitdiffstats
path: root/chrome/browser/child_process_host.cc
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 21:39:48 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-08 21:39:48 +0000
commitb3fbacff42e270eff403fc6d8d6692dd8752c34f (patch)
tree1231fc41923441f60ee3d9164d2a17a29dc3c57d /chrome/browser/child_process_host.cc
parenta2630c16a3f0ad2e2df0779ba6f474bc5317d14b (diff)
downloadchromium_src-b3fbacff42e270eff403fc6d8d6692dd8752c34f.zip
chromium_src-b3fbacff42e270eff403fc6d8d6692dd8752c34f.tar.gz
chromium_src-b3fbacff42e270eff403fc6d8d6692dd8752c34f.tar.bz2
Reenable PluginLoadUnload after fixing a race condition that made it fail in
Release mode. The problem was that we would attempt to restart the plugin process as it was shutting down. BUG=40588 Review URL: http://codereview.chromium.org/1585021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/child_process_host.cc')
-rw-r--r--chrome/browser/child_process_host.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/child_process_host.cc b/chrome/browser/child_process_host.cc
index 727d57c..539670b 100644
--- a/chrome/browser/child_process_host.cc
+++ b/chrome/browser/child_process_host.cc
@@ -312,3 +312,8 @@ ChildProcessHost* ChildProcessHost::Iterator::operator++() {
bool ChildProcessHost::Iterator::Done() {
return iterator_ == Singleton<ChildProcessList>::get()->end();
}
+
+void ChildProcessHost::ForceShutdown() {
+ Singleton<ChildProcessList>::get()->remove(this);
+ Send(new PluginProcessMsg_Shutdown());
+}