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

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

Issue 131413009: Prototype: Use Chromium IPC for plugin LOAD_MODULE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased, some FIXMEs cleaned up Created 6 years, 10 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.h
diff --git a/components/nacl/browser/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
index 26c4914ac684c148ff611edbc648590fe470f160..84f22a28fe3e16e4edfd56096f61155f9dae3a32 100644
--- a/components/nacl/browser/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -135,7 +135,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
// Sends the reply message to the renderer who is waiting for the plugin
// to load. Returns true on success.
- bool ReplyToRenderer(const IPC::ChannelHandle& channel_handle);
+ bool ReplyToRenderer();
// Sends the reply with error message to the renderer.
void SendErrorToRenderer(const std::string& error_message);
@@ -180,6 +180,8 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
void OnPpapiBrowserChannelCreated(const IPC::ChannelHandle& channel_handle);
// Called when the PPAPI IPC channel to the renderer has been created.
void OnPpapiRendererChannelCreated(const IPC::ChannelHandle& channel_handle);
+ // Called when the NaCl IPC channel to the renderer has been created
dmichael (off chromium) 2014/02/06 18:18:47 nit: period
+ void OnTrustedPluginChannelCreated(const IPC::ChannelHandle& channel_handle);
// Called by PluginListener, so messages from the untrusted side of
// the IPC proxy can be handled.
@@ -237,6 +239,9 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
int render_view_id_;
+ IPC::ChannelHandle ppapi_renderer_channel_handle_;
+ IPC::ChannelHandle nacl_renderer_channel_handle_;
+
DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
};

Powered by Google App Engine
This is Rietveld 408576698