| Index: ppapi/proxy/ppapi_messages.h
|
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
|
| index 5aa940cbaf7e32d2b46960a1e9a6b1b8d92ba581..3a98abc9cf8bb51ae8a5f6d0d829a6e6440c977c 100644
|
| --- a/ppapi/proxy/ppapi_messages.h
|
| +++ b/ppapi/proxy/ppapi_messages.h
|
| @@ -1261,10 +1261,6 @@ IPC_SYNC_MESSAGE_ROUTED2_1(
|
| PP_Instance /* instance */,
|
| ppapi::proxy::PPBFlash_DrawGlyphs_Params /* params */,
|
| PP_Bool /* result */)
|
| -IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_GetProxyForURL,
|
| - PP_Instance /* instance */,
|
| - std::string /* url */,
|
| - ppapi::proxy::SerializedVar /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED4_1(PpapiHostMsg_PPBFlash_Navigate,
|
| PP_Instance /* instance */,
|
| ppapi::URLRequestInfoData /* request_data */,
|
| @@ -1279,7 +1275,6 @@ IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_IsRectTopmost,
|
| PP_Instance /* instance */,
|
| PP_Rect /* rect */,
|
| PP_Bool /* result */)
|
| -IPC_MESSAGE_ROUTED0(PpapiHostMsg_PPBFlash_UpdateActivity)
|
| IPC_SYNC_MESSAGE_ROUTED3_2(PpapiHostMsg_PPBFlash_OpenFileRef,
|
| PP_Instance /* instance */,
|
| ppapi::HostResource /* file_ref */,
|
| @@ -1597,6 +1592,13 @@ IPC_MESSAGE_CONTROL0(PpapiPluginMsg_AudioInput_OpenReply)
|
| IPC_MESSAGE_CONTROL1(PpapiHostMsg_AudioInput_StartOrStop, bool /* capture */)
|
| IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioInput_Close)
|
|
|
| +// Flash.
|
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_Create)
|
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_UpdateActivity)
|
| +IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_GetProxyForURL, std::string /* url */)
|
| +IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Flash_GetProxyForURLReply,
|
| + std::string /* proxy */)
|
| +
|
| // Flash clipboard.
|
| IPC_MESSAGE_CONTROL0(PpapiHostMsg_FlashClipboard_Create)
|
| IPC_MESSAGE_CONTROL1(PpapiHostMsg_FlashClipboard_RegisterCustomFormat,
|
| @@ -1645,9 +1647,6 @@ IPC_MESSAGE_CONTROL1(PpapiHostMsg_FlashMenu_Show,
|
| IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashMenu_ShowReply,
|
| int32_t /* selected_id */)
|
|
|
| -// Flash functions.
|
| -IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_Create)
|
| -
|
| // VideoCapture_Dev, plugin -> host
|
| IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoCapture_Create)
|
| IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoCapture_StartCapture)
|
|
|