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

Unified Diff: content/renderer/media/android/renderer_media_player_manager.h

Issue 110683002: Split the hole punching logic from GOOGLE_TV ifdef to VIDEO_HOLE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years 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/media/android/renderer_media_player_manager.h
diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h
index 0965611660f368b7b420acdbe5555f5c40075e99..cf1a48f3b09c7569e3a28bcac744ff27d8bca402 100644
--- a/content/renderer/media/android/renderer_media_player_manager.h
+++ b/content/renderer/media/android/renderer_media_player_manager.h
@@ -80,13 +80,13 @@ class RendererMediaPlayerManager : public RenderViewObserver {
// Requests the player to exit fullscreen.
void ExitFullscreen(int player_id);
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// Requests an external surface for out-of-band compositing.
void RequestExternalSurface(int player_id, const gfx::RectF& geometry);
// RenderViewObserver overrides.
virtual void DidCommitCompositorFrame() OVERRIDE;
-#endif
+#endif // defined(VIDEO_HOLE)
// Encrypted media related methods.
void InitializeCDM(int media_keys_id,
@@ -132,10 +132,10 @@ class RendererMediaPlayerManager : public RenderViewObserver {
// Gets the pointer to ProxyMediaKeys given the |media_keys_id|.
ProxyMediaKeys* GetMediaKeys(int media_keys_id);
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
// Gets the list of media players with video geometry changes.
void RetrieveGeometryChanges(std::map<int, gfx::RectF>* changes);
-#endif
+#endif // defined(VIDEO_HOLE)
private:
// Message handlers.
« no previous file with comments | « content/common/media/media_player_messages_android.h ('k') | content/renderer/media/android/renderer_media_player_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698