diff options
Diffstat (limited to 'chrome/browser/nacl_host')
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 21 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.h | 10 |
2 files changed, 16 insertions, 15 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 2b97881..333cc3e 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -19,7 +19,7 @@ #include "chrome/common/nacl_cmd_line.h" #include "chrome/common/nacl_messages.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_message_filter.h" +#include "chrome/browser/renderer_host/chrome_render_message_filter.h" #include "ipc/ipc_switches.h" #include "native_client/src/shared/imc/nacl_imc.h" @@ -82,12 +82,13 @@ NaClProcessHost::~NaClProcessHost() { // OnProcessLaunched didn't get called because the process couldn't launch. // Don't keep the renderer hanging. reply_msg_->set_reply_error(); - render_message_filter_->Send(reply_msg_); + chrome_render_message_filter_->Send(reply_msg_); } -bool NaClProcessHost::Launch(RenderMessageFilter* render_message_filter, - int socket_count, - IPC::Message* reply_msg) { +bool NaClProcessHost::Launch( + ChromeRenderMessageFilter* chrome_render_message_filter, + int socket_count, + IPC::Message* reply_msg) { #ifdef DISABLE_NACL NOTIMPLEMENTED() << "Native Client disabled at build time"; return false; @@ -124,7 +125,7 @@ bool NaClProcessHost::Launch(RenderMessageFilter* render_message_filter, return false; } UmaNaclHistogramEnumeration(NACL_STARTED); - render_message_filter_ = render_message_filter; + chrome_render_message_filter_ = chrome_render_message_filter; reply_msg_ = reply_msg; return true; @@ -198,7 +199,7 @@ void NaClProcessHost::OnProcessLaunched() { DuplicateHandle(base::GetCurrentProcessHandle(), reinterpret_cast<HANDLE>( internal_->sockets_for_renderer[i]), - render_message_filter_->peer_handle(), + chrome_render_message_filter_->peer_handle(), &handle_in_renderer, GENERIC_READ | GENERIC_WRITE, FALSE, @@ -219,7 +220,7 @@ void NaClProcessHost::OnProcessLaunched() { // Copy the process handle into the renderer process. DuplicateHandle(base::GetCurrentProcessHandle(), handle(), - render_message_filter_->peer_handle(), + chrome_render_message_filter_->peer_handle(), &nacl_process_handle, PROCESS_DUP_HANDLE, FALSE, @@ -234,8 +235,8 @@ void NaClProcessHost::OnProcessLaunched() { ViewHostMsg_LaunchNaCl::WriteReplyParams( reply_msg_, handles_for_renderer, nacl_process_handle, nacl_process_id); - render_message_filter_->Send(reply_msg_); - render_message_filter_ = NULL; + chrome_render_message_filter_->Send(reply_msg_); + chrome_render_message_filter_ = NULL; reply_msg_ = NULL; internal_->sockets_for_renderer.clear(); diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h index b4deaea..3eaee90 100644 --- a/chrome/browser/nacl_host/nacl_process_host.h +++ b/chrome/browser/nacl_host/nacl_process_host.h @@ -12,7 +12,7 @@ #include "chrome/common/nacl_types.h" #include "content/browser/browser_child_process_host.h" -class RenderMessageFilter; +class ChromeRenderMessageFilter; // Represents the browser side of the browser <--> NaCl communication // channel. There will be one NaClProcessHost per NaCl process @@ -27,7 +27,7 @@ class NaClProcessHost : public BrowserChildProcessHost { ~NaClProcessHost(); // Initialize the new NaCl process, returning true on success. - bool Launch(RenderMessageFilter* render_message_filter, + bool Launch(ChromeRenderMessageFilter* chrome_render_message_filter, int socket_count, IPC::Message* reply_msg); @@ -57,9 +57,9 @@ class NaClProcessHost : public BrowserChildProcessHost { private: ResourceDispatcherHost* resource_dispatcher_host_; - // The RenderMessageFilter that requested this NaCl process. We use this - // for sending the reply once the process has started. - scoped_refptr<RenderMessageFilter> render_message_filter_; + // The ChromeRenderMessageFilter that requested this NaCl process. We use + // this for sending the reply once the process has started. + scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter_; // The reply message to send. IPC::Message* reply_msg_; |