diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 17:54:49 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 17:54:49 +0000 |
| commit | 6761d6332edf7050a7686c0d98709e8ce6f6d2c7 (patch) | |
| tree | 373979606204b7e86d71b291140284c297b82b99 /ppapi/proxy/ppapi_param_traits.h | |
| parent | 8d91065d5a45e42f9a9597c064469a9c907976f2 (diff) | |
| download | chromium_src-6761d6332edf7050a7686c0d98709e8ce6f6d2c7.zip chromium_src-6761d6332edf7050a7686c0d98709e8ce6f6d2c7.tar.gz chromium_src-6761d6332edf7050a7686c0d98709e8ce6f6d2c7.tar.bz2 | |
Add #ifdefs to separate NaCl and non-NaCl PPAPI Proxy code.
This CL moves non-NaCl interface proxies like Flash, and also
temporarily moves unported interfaces such as Graphics3D.
BUG=116317
TEST=builds without PPAPI link errors
Review URL: https://chromiumcodereview.appspot.com/10116003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppapi_param_traits.h')
| -rw-r--r-- | ppapi/proxy/ppapi_param_traits.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h index 0cbe7f4..5b12f60 100644 --- a/ppapi/proxy/ppapi_param_traits.h +++ b/ppapi/proxy/ppapi_param_traits.h @@ -147,6 +147,7 @@ struct PPAPI_PROXY_EXPORT ParamTraits< std::vector< static void Log(const param_type& p, std::string* l); }; +#if !defined(OS_NACL) template<> struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedFlashMenu> { typedef ppapi::proxy::SerializedFlashMenu param_type; @@ -162,6 +163,7 @@ struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PPB_X509Certificate_Fields> { static bool Read(const Message* m, PickleIterator* iter, param_type* r); static void Log(const param_type& p, std::string* l); }; +#endif // !defined(OS_NACL) } // namespace IPC |