summaryrefslogtreecommitdiffstats
path: root/chrome/browser/nacl_host/nacl_process_host.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/nacl_host/nacl_process_host.cc')
-rw-r--r--chrome/browser/nacl_host/nacl_process_host.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index 46a030c..f9ac0f5 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -149,6 +149,10 @@ NaClProcessHost::~NaClProcessHost() {
reply_msg_->set_reply_error();
chrome_render_message_filter_->Send(reply_msg_);
}
+
+#if defined(OS_WIN)
+ NaClBrokerService::GetInstance()->OnLoaderDied();
+#endif
}
// Attempt to ensure the IRT will be available when we need it, but don't wait.
@@ -293,11 +297,10 @@ void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) {
OnProcessLaunched();
}
-base::TerminationStatus NaClProcessHost::GetChildTerminationStatus(
- int* exit_code) {
- if (RunningOnWOW64())
- return base::GetTerminationStatus(handle(), exit_code);
- return BrowserChildProcessHost::GetChildTerminationStatus(exit_code);
+void NaClProcessHost::OnProcessCrashed(int exit_code) {
+ std::string message = base::StringPrintf(
+ "NaCl process exited with status %i (0x%x)", exit_code, exit_code);
+ LOG(ERROR) << message;
}
// This only ever runs on the BrowserThread::FILE thread.