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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 871663003: media: Add MediaPermission interface and MediaPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 11 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | media/base/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f24982617bb4e1aee439ff23e38f355157fc35a3..ac991b45ecfa9673330a3dbf221a5bd4b073dc9f 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"
@@ -675,6 +676,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),
@@ -3389,8 +3391,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_));
}
return web_encrypted_media_client_.get();
}
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698