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

Unified Diff: content/browser/media/android/browser_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/browser/media/android/browser_media_player_manager.h
diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
index 36ed0618eade5a569e0183e16534d088517c918f..d407e7e56a873ef62c11fb4624d7b43dec2cbc6e 100644
--- a/content/browser/media/android/browser_media_player_manager.h
+++ b/content/browser/media/android/browser_media_player_manager.h
@@ -104,10 +104,10 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
media::MediaKeys::KeyError error_code,
int system_code) OVERRIDE;
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
void AttachExternalVideoSurface(int player_id, jobject surface);
void DetachExternalVideoSurface(int player_id);
-#endif
+#endif // defined(VIDEO_HOLE)
// Called to disble the current fullscreen playback if the video is encrypted.
// TODO(qinmin): remove this once we have the new fullscreen mode.
@@ -145,10 +145,10 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
void OnReleaseSession(int media_keys_id, uint32 session_id);
void OnSetMediaKeys(int player_id, int media_keys_id);
-#if defined(GOOGLE_TV)
+#if defined(VIDEO_HOLE)
virtual void OnNotifyExternalSurface(
int player_id, bool is_request, const gfx::RectF& rect);
-#endif
+#endif // defined(VIDEO_HOLE)
// Adds a given player to the list.
void AddPlayer(media::MediaPlayerAndroid* player);
« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | content/browser/media/android/browser_media_player_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698