diff options
Diffstat (limited to 'chrome/browser/nacl_host')
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 16 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 8200892..ded7390 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -13,7 +13,7 @@ #include "base/command_line.h" #include "base/metrics/nacl_histogram.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/renderer_host/resource_message_filter.h" +#include "chrome/browser/renderer_host/render_message_filter.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/nacl_cmd_line.h" @@ -74,10 +74,10 @@ NaClProcessHost::~NaClProcessHost() { // OnProcessLaunched didn't get called because the process couldn't launch. // Don't keep the renderer hanging. reply_msg_->set_reply_error(); - resource_message_filter_->Send(reply_msg_); + render_message_filter_->Send(reply_msg_); } -bool NaClProcessHost::Launch(ResourceMessageFilter* resource_message_filter, +bool NaClProcessHost::Launch(RenderMessageFilter* render_message_filter, int socket_count, IPC::Message* reply_msg) { #ifdef DISABLE_NACL @@ -116,7 +116,7 @@ bool NaClProcessHost::Launch(ResourceMessageFilter* resource_message_filter, return false; } UmaNaclHistogramEnumeration(NACL_STARTED); - resource_message_filter_ = resource_message_filter; + render_message_filter_ = render_message_filter; reply_msg_ = reply_msg; return true; @@ -186,7 +186,7 @@ void NaClProcessHost::OnProcessLaunched() { HANDLE handle_in_renderer; DuplicateHandle(base::GetCurrentProcessHandle(), reinterpret_cast<HANDLE>(sockets_for_renderer_[i]), - resource_message_filter_->handle(), + render_message_filter_->handle(), &handle_in_renderer, GENERIC_READ | GENERIC_WRITE, FALSE, @@ -207,7 +207,7 @@ void NaClProcessHost::OnProcessLaunched() { // Copy the process handle into the renderer process. DuplicateHandle(base::GetCurrentProcessHandle(), handle(), - resource_message_filter_->handle(), + render_message_filter_->handle(), &nacl_process_handle, PROCESS_DUP_HANDLE, FALSE, @@ -222,8 +222,8 @@ void NaClProcessHost::OnProcessLaunched() { ViewHostMsg_LaunchNaCl::WriteReplyParams( reply_msg_, handles_for_renderer, nacl_process_handle, nacl_process_id); - resource_message_filter_->Send(reply_msg_); - resource_message_filter_ = NULL; + render_message_filter_->Send(reply_msg_); + render_message_filter_ = NULL; reply_msg_ = NULL; 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 618492a..3b35bf7 100644 --- a/chrome/browser/nacl_host/nacl_process_host.h +++ b/chrome/browser/nacl_host/nacl_process_host.h @@ -13,7 +13,7 @@ #include "chrome/common/nacl_types.h" #include "native_client/src/shared/imc/nacl_imc.h" -class ResourceMessageFilter; +class RenderMessageFilter; // Represents the browser side of the browser <--> NaCl communication // channel. There will be one NaClProcessHost per NaCl process @@ -28,7 +28,7 @@ class NaClProcessHost : public BrowserChildProcessHost { ~NaClProcessHost(); // Initialize the new NaCl process, returning true on success. - bool Launch(ResourceMessageFilter* resource_message_filter, + bool Launch(RenderMessageFilter* render_message_filter, int socket_count, IPC::Message* reply_msg); @@ -62,9 +62,9 @@ class NaClProcessHost : public BrowserChildProcessHost { private: ResourceDispatcherHost* resource_dispatcher_host_; - // The ResourceMessageFilter that requested this NaCl process. We use this + // The RenderMessageFilter that requested this NaCl process. We use this // for sending the reply once the process has started. - scoped_refptr<ResourceMessageFilter> resource_message_filter_; + scoped_refptr<RenderMessageFilter> render_message_filter_; // The reply message to send. IPC::Message* reply_msg_; |