Do not use overlays when VR shell is enabled.

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 2842 matching lines @@
 #endif
 
   if (!url_index_.get() || url_index_->frame() != frame_)
     url_index_.reset(new media::UrlIndex(frame_));
 
   media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
       frame_, client, encrypted_client,
       GetWebMediaPlayerDelegate()->AsWeakPtr(),
       std::move(media_renderer_factory), url_index_, params);
 
+  // TODO(crbug/673886): Enable overlays for VR shell when video reprojection

[mthiesse, 2016/12/14 16:08:19]

For clarity, how about: Re-enable overlays with VR Shell enabled when VR Shell's
video reprojection surface is enabled.

[amp, 2016/12/14 18:15:04]

Sounds good. I was trying to find a good way to word it and coming up short.

Done.

[liberato (no reviews please), 2016/12/14 19:39:06]

please also include in the TODO (or the bug) to move the kOverlayFullscreenVideo
check back into the constructor, and remove SetEnableFullscreenOverlays
entirely.  it's less burden on whoever instantiates WMPI, since it's an
implementation detail.  it's only exposed because getting the VR state into WMPI
directly turned out to be even worse.

[amp, 2016/12/14 22:02:09]

I moved the kOverlayFullscreenVideo back into the constructor.  I don't think
there is a strong reason to pull it out now if we are just going to put it back
later.

+  // surface is enabled.
+  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());
   media_player->SetUseFallbackPath(use_fallback_path);
 #endif  // defined(OS_ANDROID)
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
   remoting_controller_ptr->SetSwitchRendererCallback(base::Bind(
       &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr()));
 #endif
@@ skipping 3808 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content