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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1464183002: media: Simplify MediaPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 4 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 9b199d39f2d46c50a99b84b892d381dbb2e21d6b..9f3a99df8812c9911c5ee83384e4b4a1d6081880 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -95,8 +95,7 @@
#include "content/renderer/media/audio_device_factory.h"
#include "content/renderer/media/audio_renderer_mixer_manager.h"
#include "content/renderer/media/cdm/render_cdm_factory.h"
-#include "content/renderer/media/media_permission_dispatcher_impl.h"
-#include "content/renderer/media/media_permission_dispatcher_proxy.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_impl.h"
#include "content/renderer/media/midi_dispatcher.h"
@@ -5655,16 +5654,9 @@ RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() {
#endif // defined(OS_ANDROID)
-scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy(
- scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner) {
- MediaPermissionDispatcherImpl* media_permission =
- static_cast<MediaPermissionDispatcherImpl*>(GetMediaPermission());
- return media_permission->CreateProxy(caller_task_runner);
-}
-
media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
if (!media_permission_dispatcher_)
- media_permission_dispatcher_ = new MediaPermissionDispatcherImpl(this);
+ media_permission_dispatcher_ = new MediaPermissionDispatcher(this);
nasko 2016/02/01 19:34:13 I don't see us cleaning it up in RenderFrameImpl i
xhwang 2016/02/02 00:40:34 MediaPermissionDispatcher is a RenderFrameObserver
return media_permission_dispatcher_;
}

Powered by Google App Engine
This is Rietveld 408576698