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

Unified Diff: content/browser/child_process_launcher.h

Issue 2054303002: Kill child processes on bad Mojo messages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bad-message
Patch Set: . Created 4 years, 6 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
Index: content/browser/child_process_launcher.h
diff --git a/content/browser/child_process_launcher.h b/content/browser/child_process_launcher.h
index 22e6e011e36e7f1cfcf4f428d11e0913f8992d1c..1421a9bc15b46fe37024161700b01ebc41efe088 100644
--- a/content/browser/child_process_launcher.h
+++ b/content/browser/child_process_launcher.h
@@ -16,6 +16,7 @@
#include "content/common/content_export.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/sandboxed_process_launcher_delegate.h"
+#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/scoped_platform_handle.h"
#if defined(OS_WIN)
@@ -75,6 +76,7 @@ class CONTENT_EXPORT ChildProcessLauncher : public base::NonThreadSafe {
int child_process_id,
Client* client,
const std::string& mojo_child_token,
+ const mojo::edk::ProcessErrorCallback& process_error_callback,
bool terminate_on_shutdown = true);
~ChildProcessLauncher();
@@ -152,6 +154,8 @@ class CONTENT_EXPORT ChildProcessLauncher : public base::NonThreadSafe {
int exit_code_;
ZygoteHandle zygote_;
bool starting_;
+ const mojo::edk::ProcessErrorCallback process_error_callback_;
+
// Controls whether the child process should be terminated on browser
// shutdown. Default behavior is to terminate the child.
const bool terminate_child_on_shutdown_;

Powered by Google App Engine
This is Rietveld 408576698