Chromium Code Reviews| Index: content/renderer/render_frame_impl.cc |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
| index 7ba49f246e90a950979be2283811ad9168077ceb..900b5cd96ff3def1025a806d5ccd4383ee869f9b 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -72,6 +72,7 @@ |
| #include "content/renderer/manifest/manifest_manager.h" |
| #include "content/renderer/media/audio_renderer_mixer_manager.h" |
| #include "content/renderer/media/crypto/render_cdm_factory.h" |
| +#include "content/renderer/media/media_permission_dispatcher.h" |
| #include "content/renderer/media/media_stream_dispatcher.h" |
| #include "content/renderer/media/media_stream_renderer_factory.h" |
| #include "content/renderer/media/midi_dispatcher.h" |
| @@ -636,6 +637,7 @@ RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id) |
| handling_select_range_(false), |
| notification_permission_dispatcher_(NULL), |
| web_user_media_client_(NULL), |
| + media_permission_dispatcher_(NULL), |
| midi_dispatcher_(NULL), |
| #if defined(OS_ANDROID) |
| media_player_manager_(NULL), |
| @@ -3342,8 +3344,12 @@ blink::WebEncryptedMediaClient* RenderFrameImpl::encryptedMediaClient() { |
| #else |
| scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory()); |
| #endif |
| - web_encrypted_media_client_.reset( |
| - new media::WebEncryptedMediaClientImpl(cdm_factory.Pass())); |
| + |
| + DCHECK(!media_permission_dispatcher_); |
| + media_permission_dispatcher_ = new MediaPermissionDispatcher(this); |
| + |
| + web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl( |
| + cdm_factory.Pass(), media_permission_dispatcher_)); |
|
xhwang
2015/01/22 23:40:54
Note to myself: Need to fix HtmlDocument before co
|
| } |
| return web_encrypted_media_client_.get(); |
| } |