Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1618)

Unified Diff: content/common/media/media_player_messages.h

Issue 14247018: Implement WebRTC in Chrome for TV (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..3c4e4bc8e7ae409135741897936301ed62cf2609 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
@@ -23,6 +24,7 @@
IPC_ENUM_TRAITS(media::AudioCodec)
IPC_ENUM_TRAITS(media::DemuxerStream::Status)
IPC_ENUM_TRAITS(media::DemuxerStream::Type)
+IPC_ENUM_TRAITS(media::MediaPlayerBridge::MediaSource)
IPC_ENUM_TRAITS(media::VideoCodec)
IPC_STRUCT_TRAITS_BEGIN(media::MediaPlayerHostMsg_DemuxerReady_Params)
@@ -144,7 +146,7 @@ IPC_MESSAGE_ROUTED0(MediaPlayerHostMsg_DestroyAllMediaPlayers)
IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_MediaPlayerInitialize,
int /* player_id */,
GURL /* url */,
- bool /* is_media_source */,
+ media::MediaPlayerBridge::MediaSource /* media_source */,
GURL /* first_party_for_cookies */)
// Pause the player.

Powered by Google App Engine
This is Rietveld 408576698