diff options
| author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 16:58:14 +0000 |
|---|---|---|
| committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 16:58:14 +0000 |
| commit | 373a95aa69caa254f250c40f4483d6ac2b8c780c (patch) | |
| tree | 85ff9884a544a7197e037d045bdb8982b9a8b9f9 /content/common/pepper_messages.h | |
| parent | 1960edd57c9a2389229a774ef8f66597c28ca1fb (diff) | |
| download | chromium_src-373a95aa69caa254f250c40f4483d6ac2b8c780c.zip chromium_src-373a95aa69caa254f250c40f4483d6ac2b8c780c.tar.gz chromium_src-373a95aa69caa254f250c40f4483d6ac2b8c780c.tar.bz2 | |
Re-land the reverted CL:
http://src.chromium.org/viewvc/chrome?view=rev&revision=91150
Comparing with the previous CL, this CL makes changes to
ppapi/proxy/ppapi_proxy_test.{h,cc}
TEST=None
BUG=None
Review URL: http://codereview.chromium.org/7210030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/pepper_messages.h')
| -rw-r--r-- | content/common/pepper_messages.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/content/common/pepper_messages.h b/content/common/pepper_messages.h index 5a84626..b89705e 100644 --- a/content/common/pepper_messages.h +++ b/content/common/pepper_messages.h @@ -4,27 +4,9 @@ // Multiply-included message file, no traditional include guard #include "ipc/ipc_message_macros.h" -#include "ipc/ipc_param_traits.h" #include "ipc/ipc_platform_file.h" #include "ppapi/c/private/ppb_flash_net_connector.h" - -// Singly-included section, not yet converted. -#ifndef CONTENT_COMMON_PEPPER_MESSAGES_H_ -#define CONTENT_COMMON_PEPPER_MESSAGES_H_ - -namespace IPC { - -template <> -struct ParamTraits<PP_Flash_NetAddress> { - typedef PP_Flash_NetAddress param_type; - static void Write(Message* m, const param_type& p); - static bool Read(const Message* m, void** iter, param_type* p); - static void Log(const param_type& p, std::string* l); -}; - -} // namespace IPC - -#endif // CONTENT_COMMON_PEPPER_MESSAGES_H_ +#include "ppapi/proxy/ppapi_param_traits.h" #define IPC_MESSAGE_START PepperMsgStart |