diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:37:46 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:37:46 +0000 |
| commit | adf7cd5d9de8fadd15f7559d2e7720d6760bb242 (patch) | |
| tree | 2ffa8ec45c3d560ff53e1773e52e31092278aa41 /ppapi | |
| parent | ef80e4308a8960d1965e539dc60e1505133ca677 (diff) | |
| download | chromium_src-adf7cd5d9de8fadd15f7559d2e7720d6760bb242.zip chromium_src-adf7cd5d9de8fadd15f7559d2e7720d6760bb242.tar.gz chromium_src-adf7cd5d9de8fadd15f7559d2e7720d6760bb242.tar.bz2 | |
PPAPI: Hook up Browser resource host stuff for NaCl
This does not fix handle passing, but messages that don't carry handles will probably work.
BUG=163021,163861
Review URL: https://chromiumcodereview.appspot.com/11434042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/proxy/plugin_main_nacl.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ppapi/proxy/plugin_main_nacl.cc b/ppapi/proxy/plugin_main_nacl.cc index 53120da1..0fd689b 100644 --- a/ppapi/proxy/plugin_main_nacl.cc +++ b/ppapi/proxy/plugin_main_nacl.cc @@ -85,6 +85,9 @@ class PpapiDispatcher : public ProxyChannel, const ppapi::PpapiPermissions& permissions, bool incognito, SerializedHandle handle); + void OnMsgResourceReply( + const ppapi::proxy::ResourceMessageReplyParams& reply_params, + const IPC::Message& nested_msg); void OnPluginDispatcherMessageReceived(const IPC::Message& msg); std::set<PP_Instance> instances_; @@ -163,6 +166,7 @@ void PpapiDispatcher::SetActiveURL(const std::string& url) { bool PpapiDispatcher::OnMessageReceived(const IPC::Message& msg) { IPC_BEGIN_MESSAGE_MAP(PpapiDispatcher, msg) IPC_MESSAGE_HANDLER(PpapiMsg_CreateNaClChannel, OnMsgCreateNaClChannel) + IPC_MESSAGE_HANDLER(PpapiPluginMsg_ResourceReply, OnMsgResourceReply) // All other messages are simply forwarded to a PluginDispatcher. IPC_MESSAGE_UNHANDLED(OnPluginDispatcherMessageReceived(msg)) IPC_END_MESSAGE_MAP() @@ -191,6 +195,13 @@ void PpapiDispatcher::OnMsgCreateNaClChannel( // lifetime of the attached channel. } +void PpapiDispatcher::OnMsgResourceReply( + const ppapi::proxy::ResourceMessageReplyParams& reply_params, + const IPC::Message& nested_msg) { + ppapi::proxy::PluginDispatcher::DispatchResourceReply(reply_params, + nested_msg); +} + void PpapiDispatcher::OnPluginDispatcherMessageReceived( const IPC::Message& msg) { // The first parameter should be a plugin dispatcher ID. |