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

Unified Diff: ppapi/nacl_irt/plugin_startup.cc

Issue 2151153002: Use ChannelMojo for NaCl IRT channels in non-sfi mode. Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-nacl-channel-mojo
Patch Set: rebase Created 4 years, 5 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 | « content/renderer/pepper/host_dispatcher_wrapper.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/nacl_irt/plugin_startup.cc
diff --git a/ppapi/nacl_irt/plugin_startup.cc b/ppapi/nacl_irt/plugin_startup.cc
index 2b9270ef302544ba577420cea49dcf61c7ba286c..ce9067cf1d49b763e0611484c48d14c6d20dc897 100644
--- a/ppapi/nacl_irt/plugin_startup.cc
+++ b/ppapi/nacl_irt/plugin_startup.cc
@@ -28,8 +28,8 @@ base::Thread* g_io_thread = NULL;
ManifestService* g_manifest_service = NULL;
bool IsValidChannelHandle(IPC::ChannelHandle* handle) {
- // ChannelMojo not yet supported.
- return handle && handle->socket.fd != -1 && !handle->mojo_handle.is_valid();
+ return handle &&
+ (handle->socket.fd != -1 || handle->mojo_handle.is_valid());
}
// Creates the manifest service on IO thread so that its Listener's thread and
« no previous file with comments | « content/renderer/pepper/host_dispatcher_wrapper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698