diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 18:44:22 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 18:44:22 +0000 |
| commit | 3e7daca6a672c767abf5bf4f2eef4481a922db0a (patch) | |
| tree | d13917c4b71a2e47e70f88f4e6e9cdaf1968e9d7 /media | |
| parent | e7cd01bc32a6be64b7789f9ba6af0c08b3918dc4 (diff) | |
| download | chromium_src-3e7daca6a672c767abf5bf4f2eef4481a922db0a.zip chromium_src-3e7daca6a672c767abf5bf4f2eef4481a922db0a.tar.gz chromium_src-3e7daca6a672c767abf5bf4f2eef4481a922db0a.tar.bz2 | |
Upstream fullscreen video implementation for android
BUG=136677
Review URL: https://chromiumcodereview.appspot.com/10979047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/media_player_bridge.cc | 1 | ||||
| -rw-r--r-- | media/base/android/media_player_bridge.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc index 7d5aa08..96b2005 100644 --- a/media/base/android/media_player_bridge.cc +++ b/media/base/android/media_player_bridge.cc @@ -172,7 +172,6 @@ void MediaPlayerBridge::Pause() { } } - bool MediaPlayerBridge::IsPlaying() { if (!prepared_) return pending_play_; diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h index 722f90f..242b071 100644 --- a/media/base/android/media_player_bridge.h +++ b/media/base/android/media_player_bridge.h @@ -72,7 +72,7 @@ class MediaPlayerBridge { MediaPlayerBridge(int player_id, const std::string& url, const std::string& first_party_for_cookies, - CookieGetter* cookies_getter, + CookieGetter* cookie_getter, bool hide_url_log, MediaPlayerBridgeManager* manager, const MediaErrorCB& media_error_cb, |