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

Unified Diff: content/renderer/render_frame_impl.h

Issue 318753010: Introduce the ENABLE_BROWSER_CDMS macro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MEDIA_EXPORT Created 6 years, 6 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/media/webmediaplayer_impl.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 2b4fbe0310866e4281422e2b587ac4072fe2104a..3fb83ac2a24dde688b1eef2ebcc8dcdf3f26c0b4 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -62,6 +62,8 @@ class GeolocationDispatcher;
class MediaStreamRendererFactory;
class NotificationProvider;
class PepperPluginInstanceImpl;
+class RendererCdmManager;
+class RendererMediaPlayerManager;
class RendererPpapiHost;
class RenderFrameObserver;
class RenderViewImpl;
@@ -69,11 +71,6 @@ class RenderWidget;
class RenderWidgetFullscreenPepper;
struct CustomContextMenuContext;
-#if defined(OS_ANDROID)
-class RendererCdmManager;
-class RendererMediaPlayerManager;
-#endif
-
class CONTENT_EXPORT RenderFrameImpl
: public RenderFrame,
NON_EXPORTED_BASE(public blink::WebFrameClient),
@@ -542,6 +539,9 @@ class CONTENT_EXPORT RenderFrameImpl
blink::WebMediaPlayerClient* client);
RendererMediaPlayerManager* GetMediaPlayerManager();
+#endif
+
+#if defined(ENABLE_BROWSER_CDMS)
RendererCdmManager* GetCdmManager();
#endif
@@ -611,10 +611,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.
+ // Manages 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)
+ // 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
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698