Index: content/browser/child_process_launcher.h |
diff --git a/content/browser/child_process_launcher.h b/content/browser/child_process_launcher.h |
index 9233f43c5b5a88161d30be8b6b56c422625ffd23..710247778bbfb56b16e971fd2f69d7e21c40375e 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/platform_channel_pair.h" |
namespace base { |
class CommandLine; |
@@ -98,6 +99,7 @@ class CONTENT_EXPORT ChildProcessLauncher : public base::NonThreadSafe { |
ZygoteHandle zygote, |
#if defined(OS_ANDROID) |
base::ScopedFD ipcfd, |
+ base::ScopedFD mojo_fd, |
#endif |
base::Process process); |
@@ -128,6 +130,9 @@ class CONTENT_EXPORT ChildProcessLauncher : public base::NonThreadSafe { |
// shutdown. Default behavior is to terminate the child. |
const bool terminate_child_on_shutdown_; |
+ // Platform channel used to establish Mojo IPC. |
+ mojo::edk::PlatformChannelPair mojo_platform_channel_; |
+ |
base::WeakPtrFactory<ChildProcessLauncher> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(ChildProcessLauncher); |