Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 2439543003: Do not use overlays when VR shell is enabled. (Closed)
Patch Set: Pulled out both feature checks from WMPI, inverted logic to enable instead of disable Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/blink/webmediaplayer_impl.h ('K') | « media/blink/webmediaplayer_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index a105327d0635b16c4d2fdc937a2cb7a89c32fa91..5da42d012b55a0e6e867be9fa6a9efa2360b1353 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -250,9 +250,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
force_video_overlays_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kForceVideoOverlays);
- disable_fullscreen_video_overlays_ =
- !base::FeatureList::IsEnabled(media::kOverlayFullscreenVideo);
-
if (delegate_)
delegate_id_ = delegate_->AddObserver(this);
@@ -345,14 +342,14 @@ void WebMediaPlayerImpl::DisableOverlay() {
}
void WebMediaPlayerImpl::enteredFullscreen() {
- if (!force_video_overlays_ && !disable_fullscreen_video_overlays_)
+ if (!force_video_overlays_ && enable_fullscreen_video_overlays_)
EnableOverlay();
if (observer_)
observer_->OnEnteredFullscreen();
}
void WebMediaPlayerImpl::exitedFullscreen() {
- if (!force_video_overlays_ && !disable_fullscreen_video_overlays_)
+ if (!force_video_overlays_ && enable_fullscreen_video_overlays_)
DisableOverlay();
if (observer_)
observer_->OnExitedFullscreen();
@@ -1466,6 +1463,10 @@ void WebMediaPlayerImpl::SetDeviceScaleFactor(float scale_factor) {
cast_impl_.SetDeviceScaleFactor(scale_factor);
}
+void WebMediaPlayerImpl::SetEnableFullscreenOverlays(bool enable_overlays) {
+ enable_fullscreen_video_overlays_ = enable_overlays;
+}
+
void WebMediaPlayerImpl::setPoster(const blink::WebURL& poster) {
cast_impl_.setPoster(poster);
}
« media/blink/webmediaplayer_impl.h ('K') | « media/blink/webmediaplayer_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698