diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 00:35:48 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 00:35:48 +0000 |
| commit | 305ecfc7fa649d5cde58a33db615461fe161382d (patch) | |
| tree | f36da3a902fe7f944d43f55e0d63d7c1d389d391 /content/content_renderer.gypi | |
| parent | cf8b0cc641969f18176ca87f693f82b5c2092d6e (diff) | |
| download | chromium_src-305ecfc7fa649d5cde58a33db615461fe161382d.zip chromium_src-305ecfc7fa649d5cde58a33db615461fe161382d.tar.gz chromium_src-305ecfc7fa649d5cde58a33db615461fe161382d.tar.bz2 | |
Merge WebMediaPlayerProxy and RendererMediaPlayerManager.
BUG=312358
TEST=MSE/EME player still works on Chrome for Android. No functionality change.
R=jochen@chromium.org, qinmin@chromium.org
Review URL: https://codereview.chromium.org/48773005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_renderer.gypi')
| -rw-r--r-- | content/content_renderer.gypi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index af9562a..1e72a81 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -176,8 +176,6 @@ 'renderer/media/android/stream_texture_factory_android_synchronous_impl.h', 'renderer/media/android/webmediaplayer_android.cc', 'renderer/media/android/webmediaplayer_android.h', - 'renderer/media/android/webmediaplayer_proxy_android.cc', - 'renderer/media/android/webmediaplayer_proxy_android.h', 'renderer/media/audio_decoder.cc', 'renderer/media/audio_decoder.h', 'renderer/media/audio_device_factory.cc', |