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 eda764382968862dc1c968cbffb2679c979520a4..6c51fbe4e67a78da3361e407c22e9cf41fbc2dfa 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -17,7 +17,6 @@ |
| #include "base/process/process.h" |
| #include "base/strings/string16.h" |
| #include "base/strings/utf_string_conversions.h" |
| -#include "base/thread_task_runner_handle.h" |
| #include "base/time/time.h" |
| #include "cc/base/switches.h" |
| #include "components/scheduler/renderer/renderer_scheduler.h" |
| @@ -81,7 +80,8 @@ |
| #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_permission_dispatcher_impl.h" |
| +#include "content/renderer/media/media_permission_dispatcher_proxy.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" |
| @@ -4988,9 +4988,16 @@ RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { |
| } |
| #endif // defined(OS_ANDROID) |
| +scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy( |
|
perkj_chrome
2015/09/22 08:24:16
Where is this used? Can it be moved away from the
guoweis_left_chromium
2015/09/22 18:48:49
This is used by the follow up CL.
|
| + scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner) { |
| + MediaPermissionDispatcherImpl* media_permission = |
| + static_cast<MediaPermissionDispatcherImpl*>(GetMediaPermission()); |
| + return media_permission->CreateProxy(caller_task_runner).Pass(); |
| +} |
| + |
| media::MediaPermission* RenderFrameImpl::GetMediaPermission() { |
| if (!media_permission_dispatcher_) |
| - media_permission_dispatcher_ = new MediaPermissionDispatcher(this); |
| + media_permission_dispatcher_ = new MediaPermissionDispatcherImpl(this); |
| return media_permission_dispatcher_; |
| } |