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

Unified Diff: components/nacl/browser/nacl_process_host.cc

Issue 231793003: Add IPC Channel for new ManifestService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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: components/nacl/browser/nacl_process_host.cc
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index 98f3919d0fffc649e78a218ca8f6344f743f968a..ea87ac78e3eb2c563aa1545c1b278b79a78e7d56 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -669,7 +669,8 @@ void NaClProcessHost::OnResourcesReady() {
bool NaClProcessHost::ReplyToRenderer(
const IPC::ChannelHandle& ppapi_channel_handle,
- const IPC::ChannelHandle& trusted_channel_handle) {
+ const IPC::ChannelHandle& trusted_channel_handle,
+ const IPC::ChannelHandle& embedder_service_channel_handle) {
#if defined(OS_WIN)
// If we are on 64-bit Windows, the NaCl process's sandbox is
// managed by a different process from the renderer's sandbox. We
@@ -715,6 +716,7 @@ bool NaClProcessHost::ReplyToRenderer(
NaClLaunchResult(imc_handle_for_renderer,
ppapi_channel_handle,
trusted_channel_handle,
+ embedder_service_channel_handle,
base::GetProcId(data.handle),
data.id),
std::string() /* error_message */);
@@ -854,9 +856,12 @@ bool NaClProcessHost::StartNaClExecution() {
void NaClProcessHost::OnPpapiChannelsCreated(
const IPC::ChannelHandle& browser_channel_handle,
const IPC::ChannelHandle& ppapi_renderer_channel_handle,
- const IPC::ChannelHandle& trusted_renderer_channel_handle) {
+ const IPC::ChannelHandle& trusted_renderer_channel_handle,
+ const IPC::ChannelHandle& embedder_service_channel_handle) {
if (!enable_ppapi_proxy()) {
- ReplyToRenderer(IPC::ChannelHandle(), trusted_renderer_channel_handle);
+ ReplyToRenderer(IPC::ChannelHandle(),
+ trusted_renderer_channel_handle,
+ embedder_service_channel_handle);
return;
}
@@ -910,7 +915,8 @@ void NaClProcessHost::OnPpapiChannelsCreated(
// Let the renderer know that the IPC channels are established.
ReplyToRenderer(ppapi_renderer_channel_handle,
- trusted_renderer_channel_handle);
+ trusted_renderer_channel_handle,
+ embedder_service_channel_handle);
} else {
// Attempt to open more than 1 browser channel is not supported.
// Shut down the NaCl process.

Powered by Google App Engine
This is Rietveld 408576698