Chromium Code Reviews| Index: chrome/common/cast_messages.h |
| diff --git a/chrome/common/cast_messages.h b/chrome/common/cast_messages.h |
| index 81d4fa58873c3c64ef223514847d5d00a67a2a9e..bc7c10f103f319d49dd6e0236f05c656edea3602 100644 |
| --- a/chrome/common/cast_messages.h |
| +++ b/chrome/common/cast_messages.h |
| @@ -3,17 +3,35 @@ |
| // found in the LICENSE file. |
| // IPC messages for the Cast transport API. |
| -// Multiply-included message file, hence no include guard. |
| #include <stdint.h> |
| #include "ipc/ipc_message_macros.h" |
| -#include "media/cast/cast_sender.h" |
| +#include "media/cast/common/rtp_time.h" |
| #include "media/cast/logging/logging_defines.h" |
| #include "media/cast/net/cast_transport_sender.h" |
| #include "media/cast/net/rtcp/rtcp_defines.h" |
| #include "net/base/ip_endpoint.h" |
| +#ifndef CHROME_COMMON_CAST_MESSAGES_H_ |
| +#define CHROME_COMMON_CAST_MESSAGES_H_ |
| + |
| +namespace IPC { |
| + |
| +template<> |
| +struct ParamTraits<media::cast::RtpTimeTicks> { |
| + using param_type = media::cast::RtpTimeTicks; |
| + static void Write(Message* m, const param_type& p); |
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
| + static void Log(const param_type& p, std::string* l); |
| +}; |
| + |
| +} // namespace IPC |
| + |
| +#endif // CHROME_COMMON_CAST_MESSAGES_H_ |
| + |
| +// Multiply-included message file, hence no include guard from here. |
| + |
| #undef IPC_MESSAGE_EXPORT |
| #define IPC_MESSAGE_EXPORT |
| #define IPC_MESSAGE_START CastMsgStart |
| @@ -158,7 +176,7 @@ IPC_MESSAGE_CONTROL4(CastHostMsg_SendSenderReport, |
| int32_t /* channel_id */, |
| uint32_t /* ssrc */, |
| base::TimeTicks /* current_time */, |
| - uint32_t /* current_time_as_rtp_timestamp */) |
| + media::cast::RtpTimeTicks /* cur_time_as_rtp_timestamp */) |
| IPC_MESSAGE_CONTROL3(CastHostMsg_CancelSendingFrames, |
| int32_t /* channel_id */, |
| @@ -184,4 +202,5 @@ IPC_MESSAGE_CONTROL4(CastHostMsg_New, |
| net::IPEndPoint /* remote_end_point */, |
| base::DictionaryValue /* options */) |
| -IPC_MESSAGE_CONTROL1(CastHostMsg_Delete, int32_t /* channel_id */) |
| +IPC_MESSAGE_CONTROL1( |
| + CastHostMsg_Delete, int32_t /* channel_id */) |
|
Lei Zhang
2015/12/29 02:57:23
Not sure why this is needed, but ok.
miu
2015/12/29 03:14:51
Reverted. This was just an artifact left over fro
|