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

Unified Diff: mojo/edk/system/node_channel.cc

Issue 2039713004: [mojo-edk] Make the Mojo EDK compile under NaCl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments 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
« no previous file with comments | « mojo/edk/system/core.cc ('k') | mojo/edk/system/node_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/node_channel.cc
diff --git a/mojo/edk/system/node_channel.cc b/mojo/edk/system/node_channel.cc
index 7dc53fc950ac44d776a629e43dd55d3781fb160c..eee417799afaf273e237d227e2c9961e05669a15 100644
--- a/mojo/edk/system/node_channel.cc
+++ b/mojo/edk/system/node_channel.cc
@@ -147,7 +147,12 @@ scoped_refptr<NodeChannel> NodeChannel::Create(
Delegate* delegate,
ScopedPlatformHandle platform_handle,
scoped_refptr<base::TaskRunner> io_task_runner) {
+#if defined(OS_NACL)
+ LOG(FATAL) << "Multi-process not yet supported on NaCl";
+ return nullptr;
+#else
return new NodeChannel(delegate, std::move(platform_handle), io_task_runner);
+#endif
}
// static
@@ -381,9 +386,12 @@ NodeChannel::NodeChannel(Delegate* delegate,
ScopedPlatformHandle platform_handle,
scoped_refptr<base::TaskRunner> io_task_runner)
: delegate_(delegate),
- io_task_runner_(io_task_runner),
- channel_(
- Channel::Create(this, std::move(platform_handle), io_task_runner_)) {
+ io_task_runner_(io_task_runner)
+#if !defined(OS_NACL)
+ , channel_(
+ Channel::Create(this, std::move(platform_handle), io_task_runner_))
+#endif
+ {
}
NodeChannel::~NodeChannel() {
« no previous file with comments | « mojo/edk/system/core.cc ('k') | mojo/edk/system/node_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698