Chromium Code Reviews| Index: content/common/media/media_player_messages.h |
| diff --git a/content/common/media/media_player_messages.h b/content/common/media/media_player_messages.h |
| index 20a7db2996bbe3efcfedcec8236fa7546c0026cd..c96a5b497c9cd65b9c57ee2956ad726fb41ed302 100644 |
| --- a/content/common/media/media_player_messages.h |
| +++ b/content/common/media/media_player_messages.h |
| @@ -11,6 +11,7 @@ |
| #include "content/common/content_export.h" |
| #include "googleurl/src/gurl.h" |
| #include "ipc/ipc_message_macros.h" |
| +#include "media/base/android/media_player_bridge.h" |
| #include "ui/gfx/rect_f.h" |
| #undef IPC_MESSAGE_EXPORT |
| @@ -63,6 +64,8 @@ IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) |
| IPC_STRUCT_TRAITS_END() |
| #endif |
| +IPC_ENUM_TRAITS(media::MediaPlayerAndroid::SourceType) |
| + |
| // Messages for notifying the render process of media playback status ------- |
| // Media buffering has updated. |
| @@ -141,11 +144,12 @@ IPC_MESSAGE_ROUTED1(MediaPlayerHostMsg_DestroyMediaPlayer, |
| IPC_MESSAGE_ROUTED0(MediaPlayerHostMsg_DestroyAllMediaPlayers) |
| // Initialize a media player object with the given player_id. |
| -IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_MediaPlayerInitialize, |
| - int /* player_id */, |
| - GURL /* url */, |
| - bool /* is_media_source */, |
| - GURL /* first_party_for_cookies */) |
| +IPC_MESSAGE_ROUTED4( |
| + MediaPlayerHostMsg_MediaPlayerInitialize, |
| + int /* player_id */, |
| + GURL /* url */, |
| + media::MediaPlayerAndroid::SourceType /* media_source_type */, |
|
acolwell GONE FROM CHROMIUM
2013/05/20 21:23:22
nit: s/media_//
wonsik
2013/05/21 10:09:29
Done.
|
| + GURL /* first_party_for_cookies */) |
| // Pause the player. |
| IPC_MESSAGE_ROUTED1(MediaPlayerHostMsg_MediaPlayerPause, |