| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 5aed77678c39a1043d68ca080963acf06148d014..f1c0fa0e1f5a96c9491f9e7abfce27d136732f6c 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -174,6 +174,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"
|
| @@ -217,6 +218,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;
|
| @@ -2121,6 +2123,15 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
|
| #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
|
| }
|
|
|
| +WebMediaSession* RenderFrameImpl::createMediaSession(
|
| + blink::WebLocalFrame* frame) {
|
| +#if defined(OS_ANDROID)
|
| + return new WebMediaSessionAndroid();
|
| +#else
|
| + return nullptr;
|
| +#endif // defined(OS_ANDROID)
|
| +}
|
| +
|
| blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
|
| blink::WebLocalFrame* frame,
|
| blink::WebApplicationCacheHostClient* client) {
|
| @@ -5050,6 +5061,7 @@ RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
|
| media_player_manager_ = new RendererMediaPlayerManager(this);
|
| return media_player_manager_;
|
| }
|
| +
|
| #endif // defined(OS_ANDROID)
|
|
|
| scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy(
|
|
|