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

Unified Diff: third_party/mojo/src/mojo/edk/embedder/embedder.cc

Issue 1387963004: Create a broker interface for the new Mojo EDK so that the browser can create and duplicate messa... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: presubmit whitespace error Created 5 years, 1 month 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: third_party/mojo/src/mojo/edk/embedder/embedder.cc
diff --git a/third_party/mojo/src/mojo/edk/embedder/embedder.cc b/third_party/mojo/src/mojo/edk/embedder/embedder.cc
index 8fcf6e062a64d4532629d1121e29abd0319f3ec0..95bfd8a5385538c6167a2b785324350d220cf720 100644
--- a/third_party/mojo/src/mojo/edk/embedder/embedder.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/embedder.cc
@@ -13,7 +13,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/task_runner.h"
#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/embedder_internal.h"
#include "mojo/edk/embedder/process_delegate.h"
+#include "mojo/edk/system/core.h"
#include "third_party/mojo/src/mojo/edk/embedder/embedder_internal.h"
#include "third_party/mojo/src/mojo/edk/embedder/master_process_delegate.h"
#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
@@ -27,8 +29,6 @@
#include "third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.h"
#include "third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h"
#include "third_party/mojo/src/mojo/edk/system/raw_channel.h"
-#include "../../../../../../mojo/edk/system/core.h"
-#include "../../../../../../mojo/edk/embedder/embedder_internal.h"
namespace mojo {
namespace embedder {
@@ -94,6 +94,28 @@ system::ChannelId MakeChannelId() {
} // namespace
+#if defined(OS_WIN)
+void PreInitializeParentProcess() {
+ edk::PreInitializeParentProcess();
+}
+
+void PreInitializeChildProcess() {
+ edk::PreInitializeChildProcess();
+}
+
+HANDLE ChildProcessLaunched(HANDLE child_process) {
+ return edk::ChildProcessLaunched(child_process);
+}
+
+void ChildProcessLaunched(HANDLE child_process, HANDLE server_pipe) {
+ return edk::ChildProcessLaunched(child_process, server_pipe);
+}
+
+void SetParentPipeHandle(HANDLE pipe) {
+ edk::SetParentPipeHandle(pipe);
+}
+#endif
+
void SetMaxMessageSize(size_t bytes) {
system::GetMutableConfiguration()->max_message_num_bytes = bytes;
// TODO(use_chrome_edk): also set this in the new EDK.

Powered by Google App Engine
This is Rietveld 408576698