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

Unified Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 11441012: PPB_UDPSocket_Private is switched to the new Pepper proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix. Created 7 years, 11 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
Index: chrome/browser/nacl_host/nacl_process_host.cc
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index c8eb47afab339378d89308faa0ecb429228370b9..9ba68bf6d81c38875ae039822a00607a26773eeb 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -38,6 +38,7 @@
#include "content/public/browser/browser_ppapi_host.h"
#include "content/public/browser/child_process_data.h"
#include "content/public/common/child_process_host.h"
+#include "content/public/common/process_type.h"
#include "extensions/common/constants.h"
#include "extensions/common/url_pattern.h"
#include "ipc/ipc_channel.h"
@@ -777,6 +778,8 @@ void NaClProcessHost::OnPpapiChannelCreated(
// If the proxy channel is null, this must be the initial NaCl-Browser IPC
// channel.
if (!ipc_proxy_channel_.get()) {
+ DCHECK_EQ(content::PROCESS_TYPE_NACL_LOADER, process_->GetData().type);
+
ipc_proxy_channel_.reset(
new IPC::ChannelProxy(channel_handle,
IPC::Channel::MODE_CLIENT,
@@ -785,7 +788,7 @@ void NaClProcessHost::OnPpapiChannelCreated(
// Create the browser ppapi host and enable PPAPI message dispatching to the
// browser process.
ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess(
- ipc_proxy_channel_.get(), //process_.get(), // sender
+ ipc_proxy_channel_.get(), // sender
permissions_,
process_->GetData().handle,
ipc_proxy_channel_.get(),

Powered by Google App Engine
This is Rietveld 408576698