Chromium Code Reviews| Index: content/renderer/media/android/webmediaplayer_android.h |
| diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h |
| index d2e9e51cbfef831bef4ade548c6d74bbda7662f6..f11f3ff2df7d8dec7f04bfa81da23f25a0da76af 100644 |
| --- a/content/renderer/media/android/webmediaplayer_android.h |
| +++ b/content/renderer/media/android/webmediaplayer_android.h |
| @@ -32,7 +32,6 @@ |
| #include "ui/gfx/rect_f.h" |
| namespace media { |
| -class Demuxer; |
| class MediaLog; |
| } |
| @@ -48,11 +47,6 @@ namespace content { |
| class WebMediaPlayerDelegate; |
| class RendererMediaPlayerManager; |
| -#if defined(GOOGLE_TV) |
| -class MediaStreamAudioRenderer; |
| -class MediaStreamClient; |
| -#endif |
| - |
| // This class implements blink::WebMediaPlayer by keeping the android |
| // media player in the browser process. It listens to all the status changes |
| // sent from the browser process and sends playback controls to the media |
| @@ -225,13 +219,6 @@ class WebMediaPlayerAndroid |
| void OnNeedKey(const std::string& type, |
| const std::vector<uint8>& init_data); |
| -#if defined(GOOGLE_TV) |
| - bool InjectMediaStream(MediaStreamClient* media_stream_client, |
| - media::Demuxer* demuxer, |
| - const base::Closure& destroy_demuxer_cb); |
| -#endif |
| - |
| - // Can be called on any thread. |
|
wonsik
2014/01/14 05:22:23
This should remain.
ycheo (away)
2014/01/14 05:28:44
Oops!, thanks for catching this.
|
| static void OnReleaseRemotePlaybackTexture( |
| const scoped_refptr<base::MessageLoopProxy>& main_loop, |
| const base::WeakPtr<WebMediaPlayerAndroid>& player, |
| @@ -402,18 +389,6 @@ class WebMediaPlayerAndroid |
| gfx::RectF last_computed_rect_; |
| #endif // defined(VIDEO_HOLE) |
| -#if defined(GOOGLE_TV) |
| - // Pixel threshold for external surface usage. Negative value means that the |
| - // threshold is not defined, so that external surface is never used. |
| - int external_surface_threshold_; |
| - |
| - // Media Stream related fields. |
| - media::Demuxer* demuxer_; |
| - base::Closure destroy_demuxer_cb_; |
| - scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; |
| - MediaStreamClient* media_stream_client_; |
| -#endif |
| - |
| scoped_ptr<MediaSourceDelegate, |
| MediaSourceDelegate::Destroyer> media_source_delegate_; |