| Index: ppapi/proxy/ppb_flash_proxy.h
|
| diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h
|
| index 09728ef78c51b30a1b5b2d45d92da08a662b7133..43c85cd7135e4bc9a43ec4693379a417697385f4 100644
|
| --- a/ppapi/proxy/ppb_flash_proxy.h
|
| +++ b/ppapi/proxy/ppb_flash_proxy.h
|
| @@ -18,7 +18,7 @@
|
| #include "ppapi/proxy/interface_proxy.h"
|
| #include "ppapi/proxy/serialized_var.h"
|
| #include "ppapi/shared_impl/host_resource.h"
|
| -#include "ppapi/shared_impl/ppb_flash_shared.h"
|
| +#include "ppapi/thunk/ppb_flash_api.h"
|
|
|
| struct PPB_Flash_Print_1_0;
|
|
|
| @@ -37,7 +37,7 @@ class SerializedVarReturnValue;
|
| // implemented in the new-style resource proxy (see flash_resource.h).
|
| // TODO(raymes): All of these functions should be moved to the new-style proxy.
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -class PPB_Flash_Proxy : public InterfaceProxy, public PPB_Flash_Shared {
|
| +class PPB_Flash_Proxy : public InterfaceProxy, public thunk::PPB_Flash_API {
|
| public:
|
| explicit PPB_Flash_Proxy(Dispatcher* dispatcher);
|
| virtual ~PPB_Flash_Proxy();
|
| @@ -88,34 +88,6 @@ class PPB_Flash_Proxy : public InterfaceProxy, public PPB_Flash_Shared {
|
| virtual PP_Bool SetCrashData(PP_Instance instance,
|
| PP_FlashCrashKey key,
|
| PP_Var value) OVERRIDE;
|
| - virtual bool CreateThreadAdapterForInstance(PP_Instance instance) OVERRIDE;
|
| - virtual void ClearThreadAdapterForInstance(PP_Instance instance) OVERRIDE;
|
| - virtual int32_t OpenFile(PP_Instance instance,
|
| - const char* path,
|
| - int32_t mode,
|
| - PP_FileHandle* file) OVERRIDE;
|
| - virtual int32_t RenameFile(PP_Instance instance,
|
| - const char* path_from,
|
| - const char* path_to) OVERRIDE;
|
| - virtual int32_t DeleteFileOrDir(PP_Instance instance,
|
| - const char* path,
|
| - PP_Bool recursive) OVERRIDE;
|
| - virtual int32_t CreateDir(PP_Instance instance, const char* path) OVERRIDE;
|
| - virtual int32_t QueryFile(PP_Instance instance,
|
| - const char* path,
|
| - PP_FileInfo* info) OVERRIDE;
|
| - virtual int32_t GetDirContents(PP_Instance instance,
|
| - const char* path,
|
| - PP_DirContents_Dev** contents) OVERRIDE;
|
| - virtual int32_t CreateTemporaryFile(PP_Instance instance,
|
| - PP_FileHandle* file) OVERRIDE;
|
| - virtual int32_t OpenFileRef(PP_Instance instance,
|
| - PP_Resource file_ref,
|
| - int32_t mode,
|
| - PP_FileHandle* file) OVERRIDE;
|
| - virtual int32_t QueryFileRef(PP_Instance instance,
|
| - PP_Resource file_ref,
|
| - PP_FileInfo* info) OVERRIDE;
|
| virtual PP_Bool FlashIsFullscreen(PP_Instance instance) OVERRIDE;
|
| virtual PP_Bool FlashSetFullscreen(PP_Instance instance,
|
| PP_Bool fullscreen) OVERRIDE;
|
| @@ -152,15 +124,6 @@ class PPB_Flash_Proxy : public InterfaceProxy, public PPB_Flash_Shared {
|
| void OnHostMsgFlashGetScreenSize(PP_Instance instance,
|
| PP_Bool* result,
|
| PP_Size* size);
|
| - void OnHostMsgOpenFileRef(PP_Instance instance,
|
| - const ppapi::HostResource& host_resource,
|
| - int32_t mode,
|
| - IPC::PlatformFileForTransit* file_handle,
|
| - int32_t* result);
|
| - void OnHostMsgQueryFileRef(PP_Instance instance,
|
| - const ppapi::HostResource& host_resource,
|
| - PP_FileInfo* info,
|
| - int32_t* result);
|
| void OnHostMsgGetDeviceID(PP_Instance instance,
|
| SerializedVarReturnValue id);
|
| void OnHostMsgGetSetting(PP_Instance instance,
|
|
|