Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 0179a9c1a5568f865c138447966a8f0d0b83418a..6c90e1e6c9c3180213fec48e8556636e059a4a10 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -2857,6 +2857,13 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( |
GetWebMediaPlayerDelegate()->AsWeakPtr(), |
std::move(media_renderer_factory), url_index_, params); |
+ // TODO(http://crbug.com/673886): Re-enable overlays with VR shell enabled when VR |
ddorwin
2016/12/16 19:15:18
`>80 chars
amp
2016/12/16 19:25:03
Done. Too many rewordings. :) I'm surprised git
|
+ // shell's video reprojection surface is enabled. Remove the setter and put |
+ // the overlay feature check back in the WMPI constructor at that time. |
+ media_player->SetEnableFullscreenOverlays( |
+ base::FeatureList::IsEnabled(media::kOverlayFullscreenVideo) && |
+ !base::FeatureList::IsEnabled(features::kVrShell)); |
+ |
#if defined(OS_ANDROID) // WMPI_CAST |
media_player->SetMediaPlayerManager(GetMediaPlayerManager()); |
media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); |