diff options
author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 06:10:57 +0000 |
---|---|---|
committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 06:10:57 +0000 |
commit | cd57d088c61b38881261c159792537e8b93eb6b8 (patch) | |
tree | b8623b5600833d4deeaca2b1617655c4ad2395c2 /ppapi/proxy/ppapi_param_traits.h | |
parent | 199e9257d7e6da23084e5ce1d971612bf8ad4c5a (diff) | |
download | chromium_src-cd57d088c61b38881261c159792537e8b93eb6b8.zip chromium_src-cd57d088c61b38881261c159792537e8b93eb6b8.tar.gz chromium_src-cd57d088c61b38881261c159792537e8b93eb6b8.tar.bz2 |
Revert 171389
The revert is causing browser tests to fail. Reverting the revert.
> Revert 171080
>
> > The refactors PPB_Flash_File_ModuleLocal/FileRef to the new resource model. Calls for both these interfaces are now made directly to the browser. This removes the in-process implementation for these interfaces also (as they are flash-only). Tests are added for PPB_Flash_File_ModuleLocal.
> >
> > Review URL: https://codereview.chromium.org/11359097
>
> TBR=raymes@chromium.org
>
> Review URL: https://codereview.chromium.org/11437038
TBR=raymes@chromium.org
Review URL: https://codereview.chromium.org/11450025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppapi_param_traits.h')
-rw-r--r-- | ppapi/proxy/ppapi_param_traits.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h index 13f7351..7556e35 100644 --- a/ppapi/proxy/ppapi_param_traits.h +++ b/ppapi/proxy/ppapi_param_traits.h @@ -14,6 +14,7 @@ #include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_var.h" #include "ppapi/proxy/ppapi_proxy_export.h" +#include "ppapi/shared_impl/file_path.h" #include "ppapi/shared_impl/ppapi_permissions.h" #include "ppapi/shared_impl/ppb_file_ref_shared.h" @@ -166,6 +167,14 @@ struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PpapiPermissions> { }; #if !defined(OS_NACL) && !defined(NACL_WIN64) +template <> +struct ParamTraits<ppapi::PepperFilePath> { + typedef ppapi::PepperFilePath param_type; + static void Write(Message* m, const param_type& p); + static bool Read(const Message* m, PickleIterator* iter, param_type* p); + static void Log(const param_type& p, std::string* l); +}; + template<> struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedFlashMenu> { typedef ppapi::proxy::SerializedFlashMenu param_type; |