Chromium Code Reviews| Index: ppapi/proxy/ppb_instance_proxy.cc |
| diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc |
| index 5f0c163306a624c15b495279a352d5f0dbb66d92..abc09190b2e1a33d187c14a3994e7fafd15f121b 100644 |
| --- a/ppapi/proxy/ppb_instance_proxy.cc |
| +++ b/ppapi/proxy/ppb_instance_proxy.cc |
| @@ -14,6 +14,7 @@ |
| #include "ppapi/c/private/pp_content_decryptor.h" |
| #include "ppapi/proxy/content_decryptor_private_serializer.h" |
| #include "ppapi/proxy/enter_proxy.h" |
| +#include "ppapi/proxy/flash_resource.h" |
| #include "ppapi/proxy/gamepad_resource.h" |
| #include "ppapi/proxy/host_dispatcher.h" |
| #include "ppapi/proxy/plugin_dispatcher.h" |
| @@ -313,6 +314,28 @@ thunk::PPB_Flash_API* PPB_Instance_Proxy::GetFlashAPI() { |
| return static_cast<PPB_Flash_Proxy*>(ip); |
| } |
| +thunk::PPB_Flash_Functions_API* PPB_Instance_Proxy::GetFlashFunctionsAPI( |
| + PP_Instance instance) { |
| +#if !defined(OS_NACL) && !defined(NACL_WIN64) |
|
yzshen1
2012/10/09 17:17:47
Please include build/build_config.h
|
| + InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> |
| + GetInstanceData(instance); |
| + if (!data) |
| + return NULL; |
| + |
| + if (!data->flash_resource.get()) { |
| + Connection connection( |
| + PluginGlobals::Get()->plugin_proxy_delegate()->GetBrowserSender(), |
| + dispatcher()); |
| + data->flash_resource = new FlashResource(connection, instance); |
| + } |
| + return data->flash_resource.get(); |
| +#else |
| + // Flash functions aren't implemented for nacl. |
| + NOTIMPLEMENTED(); |
| + return NULL; |
| +#endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| +} |
| + |
| thunk::PPB_Gamepad_API* PPB_Instance_Proxy::GetGamepadAPI( |
| PP_Instance instance) { |
| InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> |