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

Unified Diff: content/renderer/pepper/host_dispatcher_wrapper.cc

Issue 2168523002: Use ChannelMojo for plugin-renderer channels. Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-nacl-ipc-fds
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/ppapi_plugin/ppapi_thread.cc ('k') | content/renderer/pepper/pepper_broker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/host_dispatcher_wrapper.cc
diff --git a/content/renderer/pepper/host_dispatcher_wrapper.cc b/content/renderer/pepper/host_dispatcher_wrapper.cc
index 034dadc1260f672e9feaae078898c366b18ab56f..348f95200445fdb58e8aae5749de84eb351c7ad4 100644
--- a/content/renderer/pepper/host_dispatcher_wrapper.cc
+++ b/content/renderer/pepper/host_dispatcher_wrapper.cc
@@ -37,16 +37,9 @@ bool HostDispatcherWrapper::Init(const IPC::ChannelHandle& channel_handle,
PP_GetInterface_Func local_get_interface,
const ppapi::Preferences& preferences,
scoped_refptr<PepperHungPluginFilter> filter) {
- if (channel_handle.name.empty())
+ if (!channel_handle.mojo_handle.is_valid())
return false;
-#if defined(OS_POSIX)
- DCHECK(channel_handle.socket.fd != -1 ||
- channel_handle.mojo_handle.is_valid());
- if (channel_handle.socket.fd == -1 && !channel_handle.mojo_handle.is_valid())
- return false;
-#endif
-
dispatcher_delegate_.reset(new PepperProxyChannelDelegateImpl);
dispatcher_.reset(new ppapi::proxy::HostDispatcher(
module_->pp_module(), local_get_interface, permissions_));
« no previous file with comments | « content/ppapi_plugin/ppapi_thread.cc ('k') | content/renderer/pepper/pepper_broker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698