diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 21:58:06 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 21:58:06 +0000 |
| commit | 0d586af877d89aadf5c5896971a1b6c5a33b49ec (patch) | |
| tree | 9d5eb1d9e1b78ac50d9b2bbdea8b4ca187033691 /chrome/renderer/pepper | |
| parent | 95dadd35dc272523ed6990c43ac27501ce50e693 (diff) | |
| download | chromium_src-0d586af877d89aadf5c5896971a1b6c5a33b49ec.zip chromium_src-0d586af877d89aadf5c5896971a1b6c5a33b49ec.tar.gz chromium_src-0d586af877d89aadf5c5896971a1b6c5a33b49ec.tar.bz2 | |
Pepper: Hook up the in-process router for browser.
This is mostly stolen from raymes' change at:
https://codereview.chromium.org/15774020/
but cleaned up to apply to master. It also adds in-process variants of the ResourceCall and ResourceReply messages, which are needed because the reply message from the browser to the renderer must be properly routed.
This change has been tested (along with a series of other changes) and was shown to work for in-process plugins in the "new" resource proxy.
TBR=jochen
BUG=225441
Review URL: https://chromiumcodereview.appspot.com/19238007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/pepper')
| -rw-r--r-- | chrome/renderer/pepper/pepper_flash_menu_host.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/renderer/pepper/pepper_flash_menu_host.cc b/chrome/renderer/pepper/pepper_flash_menu_host.cc index 3d4b905..a948ce5 100644 --- a/chrome/renderer/pepper/pepper_flash_menu_host.cc +++ b/chrome/renderer/pepper/pepper_flash_menu_host.cc @@ -8,6 +8,7 @@ #include "content/public/common/context_menu_params.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/renderer_ppapi_host.h" +#include "ipc/ipc_message.h" #include "ppapi/c/private/ppb_flash_menu.h" #include "ppapi/host/dispatch_host_message.h" #include "ppapi/host/ppapi_host.h" @@ -196,7 +197,7 @@ void PepperFlashMenuHost::OnMenuClosed(int request_id) { void PepperFlashMenuHost::SendMenuReply(int32_t result, int action) { ppapi::host::ReplyMessageContext reply_context( ppapi::proxy::ResourceMessageReplyParams(pp_resource(), 0), - NULL); + NULL, MSG_ROUTING_NONE); reply_context.params.set_result(result); host()->SendReply(reply_context, PpapiPluginMsg_FlashMenu_ShowReply(action)); |