diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 23:26:35 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 23:26:35 +0000 |
| commit | 56f04e70d9b97a4aa7c655dbc2a10f086c85b553 (patch) | |
| tree | 0fc7895b929f9aabd3b25d6da8dbf4c9dd7784cd /content/browser/android/media_player_manager_impl.h | |
| parent | 5da3bc9c5399699a872ea9f9ab341c8f0713b1f1 (diff) | |
| download | chromium_src-56f04e70d9b97a4aa7c655dbc2a10f086c85b553.zip chromium_src-56f04e70d9b97a4aa7c655dbc2a10f086c85b553.tar.gz chromium_src-56f04e70d9b97a4aa7c655dbc2a10f086c85b553.tar.bz2 | |
Main changes are
- Rename ContentVideoViewContextDelegate to ContentVideoViewClient, instead of having the getContext() method, passing the context to ContentVideoView when it is created.
- Add getContentVideoViewClient method in ContentViewClient, so it will be created when it actually used.
BUG=http://b/8315237
Review URL: https://chromiumcodereview.appspot.com/13669003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android/media_player_manager_impl.h')
| -rw-r--r-- | content/browser/android/media_player_manager_impl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/android/media_player_manager_impl.h b/content/browser/android/media_player_manager_impl.h index f6d0622..a16e7fa 100644 --- a/content/browser/android/media_player_manager_impl.h +++ b/content/browser/android/media_player_manager_impl.h @@ -150,8 +150,9 @@ class MediaPlayerManagerImpl // An array of managed players. ScopedVector<media::MediaPlayerAndroid> players_; - // The fullscreen video view object. - ContentVideoView video_view_; + // The fullscreen video view object or NULL if video is not played in + // fullscreen. + scoped_ptr<ContentVideoView> video_view_; // Player ID of the fullscreen media player. int fullscreen_player_id_; |