Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 339d818953fafa5f75e9d3819d5bcdec2c2aae70..3e832d0ebca4476bfac1fa4c27d9605272e1ebd4 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -175,6 +175,7 @@ |
#include "content/renderer/media/android/renderer_media_player_manager.h" |
#include "content/renderer/media/android/stream_texture_factory_impl.h" |
#include "content/renderer/media/android/webmediaplayer_android.h" |
+#include "content/renderer/media/android/webmediasession_android.h" |
#else |
#include "cc/blink/context_provider_web_context.h" |
#include "content/renderer/usb/web_usb_client_impl.h" |
@@ -219,6 +220,7 @@ using blink::WebLocalFrame; |
using blink::WebMediaPlayer; |
using blink::WebMediaPlayerClient; |
using blink::WebMediaPlayerEncryptedMediaClient; |
+using blink::WebMediaSession; |
using blink::WebNavigationPolicy; |
using blink::WebNavigationType; |
using blink::WebNode; |
@@ -2127,6 +2129,15 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( |
#endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) |
} |
+WebMediaSession* RenderFrameImpl::createMediaSession( |
+ blink::WebLocalFrame* frame) { |
philipj_slow
2015/10/07 14:37:12
I suppose remove this argument and add it back if
davve
2015/10/08 09:17:35
Done.
|
+#if defined(OS_ANDROID) |
+ return new WebMediaSessionAndroid(); |
+#else |
+ return nullptr; |
+#endif // defined(OS_ANDROID) |
+} |
+ |
blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( |
blink::WebLocalFrame* frame, |
blink::WebApplicationCacheHostClient* client) { |
@@ -5108,6 +5119,7 @@ RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { |
media_player_manager_ = new RendererMediaPlayerManager(this); |
return media_player_manager_; |
} |
+ |
mlamouri (slow - plz ping)
2015/10/07 14:19:30
nit: remove that change.
philipj_slow
2015/10/07 14:37:12
Stray whitespace.
davve
2015/10/08 09:17:35
Done.
|
#endif // defined(OS_ANDROID) |
scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy( |