| Index: content/gpu/gpu_child_thread.h
|
| diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
|
| index 597afef350594cb156c1d1b83d028d2f5a2ac258..a0944c994d56cb7531439bbda1a93129dfb96d09 100644
|
| --- a/content/gpu/gpu_child_thread.h
|
| +++ b/content/gpu/gpu_child_thread.h
|
| @@ -34,6 +34,10 @@ class GpuMemoryBufferFactory;
|
| class SyncPointManager;
|
| }
|
|
|
| +namespace media {
|
| +class MediaPermission;
|
| +}
|
| +
|
| namespace sandbox {
|
| class TargetServices;
|
| }
|
| @@ -41,6 +45,7 @@ class TargetServices;
|
| namespace content {
|
| class GpuProcessControlImpl;
|
| class GpuWatchdogThread;
|
| +class MediaPermissionDispatcher;
|
| class MediaService;
|
| struct EstablishChannelParams;
|
| #if defined(OS_MACOSX)
|
| @@ -146,6 +151,13 @@ class GpuChildThread : public ChildThreadImpl,
|
| #endif
|
| void OnLoseAllContexts();
|
|
|
| + // Connect to an interface provided by the service registry.
|
| + template <typename Interface>
|
| + void GetInterface(mojo::InterfaceRequest<Interface> request);
|
| +
|
| + // Returns the MediaPermission associated with this process.
|
| + media::MediaPermission* GetMediaPermission();
|
| +
|
| void BindProcessControlRequest(
|
| mojo::InterfaceRequest<mojom::ProcessControl> request);
|
|
|
| @@ -181,6 +193,9 @@ class GpuChildThread : public ChildThreadImpl,
|
| // The gpu::GpuMemoryBufferFactory instance used to allocate GpuMemoryBuffers.
|
| gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory_;
|
|
|
| + // The media permission dispatcher attached to this frame.
|
| + scoped_ptr<MediaPermissionDispatcher> media_permission_dispatcher_;
|
| +
|
| // Process control for Mojo application hosting.
|
| std::unique_ptr<GpuProcessControlImpl> process_control_;
|
|
|
|
|