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

Unified Diff: components/nacl/loader/nonsfi/nonsfi_listener.cc

Issue 2025763002: Use ChannelMojo in Pepper and NaCl processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-utility-channel-mojo
Patch Set: iujbhirtughfbnjrthiubj 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 | « components/nacl/loader/nacl_listener.cc ('k') | content/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/loader/nonsfi/nonsfi_listener.cc
diff --git a/components/nacl/loader/nonsfi/nonsfi_listener.cc b/components/nacl/loader/nonsfi/nonsfi_listener.cc
index 2352fee1be2b6b83da6182c144eb4600e49d805f..25adae5a8f697233074534d2b55aad6a71faf502 100644
--- a/components/nacl/loader/nonsfi/nonsfi_listener.cc
+++ b/components/nacl/loader/nonsfi/nonsfi_listener.cc
@@ -89,11 +89,13 @@ void NonSfiListener::OnStart(const nacl::NaClStartParams& params) {
CHECK_NE(params.ppapi_renderer_channel_handle.socket.fd, -1);
CHECK_NE(params.trusted_service_channel_handle.socket.fd, -1);
CHECK_NE(params.manifest_service_channel_handle.socket.fd, -1);
+ CHECK_NE(params.ppapi_browser_mojo_handle.socket.fd, -1);
ppapi::SetIPCFileDescriptors(
params.ppapi_browser_channel_handle.socket.fd,
params.ppapi_renderer_channel_handle.socket.fd,
- params.manifest_service_channel_handle.socket.fd);
+ params.manifest_service_channel_handle.socket.fd,
+ params.ppapi_browser_mojo_handle.socket.fd);
ppapi::StartUpPlugin();
// TODO(teravest): Do we plan on using this renderer handle for nexe loading
« no previous file with comments | « components/nacl/loader/nacl_listener.cc ('k') | content/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698