summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-27 21:07:01 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-27 21:07:01 +0000
commitd4f3d112edb3063f60e254ce2581d6d187f871f1 (patch)
tree90031a61105d99e9c9b522f310f4e3ff45fcc936
parentc3c03f75ca4dc3f78b4b7d5c197a43ac4dbeb833 (diff)
downloadchromium_src-d4f3d112edb3063f60e254ce2581d6d187f871f1.zip
chromium_src-d4f3d112edb3063f60e254ce2581d6d187f871f1.tar.gz
chromium_src-d4f3d112edb3063f60e254ce2581d6d187f871f1.tar.bz2
Fix non Windows builds.
Review URL: http://codereview.chromium.org/55041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12707 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/child_process_host.cc4
-rw-r--r--chrome/common/child_thread.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc
index 6618554..6f4f6ef7 100644
--- a/chrome/common/child_process_host.cc
+++ b/chrome/common/child_process_host.cc
@@ -160,8 +160,10 @@ void ChildProcessHost::ListenerHook::OnMessageReceived(
Singleton<ChildProcessList>::get()->remove(host_);
if (host_->CanShutdown())
host_->Send(new PluginProcessMsg_Shutdown());
-#endif
} else {
+#else
+ {
+#endif
host_->OnMessageReceived(msg);
}
}
diff --git a/chrome/common/child_thread.cc b/chrome/common/child_thread.cc
index 22c82c0..c1ad034 100644
--- a/chrome/common/child_thread.cc
+++ b/chrome/common/child_thread.cc
@@ -121,9 +121,11 @@ void ChildThread::OnProcessFinalRelease() {
return;
}
+#if defined(OS_WIN)
// The child process shutdown sequence is a request response based mechanism,
// where we send out an initial feeler request to the child process host
// instance in the browser to verify if it's ok to shutdown the child process.
// The browser then sends back a response if it's ok to shutdown.
Send(new PluginProcessHostMsg_ShutdownRequest);
+#endif
}