| Index: content/renderer/render_frame_impl.h
|
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
| index 35e046a619bd497c93305c792a39bd29cb011313..22b439f652692492f88f744fe111cc5863f3b07d 100644
|
| --- a/content/renderer/render_frame_impl.h
|
| +++ b/content/renderer/render_frame_impl.h
|
| @@ -70,10 +70,13 @@ class RenderWidgetFullscreenPepper;
|
| struct CustomContextMenuContext;
|
|
|
| #if defined(OS_ANDROID)
|
| -class RendererCdmManager;
|
| class RendererMediaPlayerManager;
|
| #endif
|
|
|
| +#if defined(ENABLE_BROWSER_CDMS)
|
| +class RendererCdmManager;
|
| +#endif
|
| +
|
| class CONTENT_EXPORT RenderFrameImpl
|
| : public RenderFrame,
|
| NON_EXPORTED_BASE(public blink::WebFrameClient),
|
| @@ -541,6 +544,9 @@ class CONTENT_EXPORT RenderFrameImpl
|
| blink::WebMediaPlayerClient* client);
|
|
|
| RendererMediaPlayerManager* GetMediaPlayerManager();
|
| +#endif
|
| +
|
| +#if defined(ENABLE_BROWSER_CDMS)
|
| RendererCdmManager* GetCdmManager();
|
| #endif
|
|
|
| @@ -610,10 +616,16 @@ class CONTENT_EXPORT RenderFrameImpl
|
| blink::WebUserMediaClient* web_user_media_client_;
|
|
|
| #if defined(OS_ANDROID)
|
| - // These manage all media players and CDMs in this render frame for
|
| - // communicating with the real media player and CDM objects in the browser
|
| - // process. It's okay to use raw pointers since they are RenderFrameObservers.
|
| + // These manage all media players in this render frame for communicating with
|
| + // the real media player in the browser process. It's okay to use a raw
|
| + // pointer since it's a RenderFrameObserver.
|
| RendererMediaPlayerManager* media_player_manager_;
|
| +#endif
|
| +
|
| +#if defined(ENABLE_BROWSER_CDMS)
|
| + // These manage all CDMs in this render frame for communicating with the real
|
| + // CDM in the browser process. It's okay to use a raw pointer since it's a
|
| + // RenderFrameObserver.
|
| RendererCdmManager* cdm_manager_;
|
| #endif
|
|
|
|
|