Do not use overlays when VR shell is enabled.

media/blink/webmediaplayer_impl.h

 // 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.
 
 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 160 matching lines @@
                                          unsigned int type,
                                          bool premultiply_alpha,
                                          bool flip_y) override;
 
   blink::WebAudioSourceProvider* getAudioSourceProvider() override;
 
   void setContentDecryptionModule(
       blink::WebContentDecryptionModule* cdm,
       blink::WebContentDecryptionModuleResult result) override;
 
+  void SetEnableFullscreenOverlays(bool enable_overlays);
   bool supportsOverlayFullscreenVideo() override;
   void enteredFullscreen() override;
   void exitedFullscreen() override;
   void becameDominantVisibleContent(bool isDominant) override;
 
   // WebMediaPlayerDelegate::Observer implementation.
   void OnHidden() override;
   void OnShown() override;
   bool OnSuspendRequested(bool must_suspend) override;
   void OnPlay() override;
@@ skipping 334 matching lines @@
   // The current overlay surface id. Populated while in fullscreen once the
   // surface is created.
   int overlay_surface_id_;
 
   // If a surface is requested before it's finished being created, the request
   // is saved and satisfied once the surface is available. If the decoder does
   // not require restart to change surfaces, this is callback is kept until
   // cleared by the decoder.
   SurfaceCreatedCB set_surface_cb_;
 
-  // Force to use SurfaceView instead of SurfaceTexture on Android.
+  // On Android an overlay surface means using
+  // SurfaceView instead of SurfaceTexture.
+
+  // Force using video overlays for all uses of WMPI.

[ddorwin, 2016/12/16 19:15:18]

nit: WMPI is the class, so "this class" might be better.

However, "all uses" may not be correct. It's not correct for audio-only and
maybe not even all video (e.g., off screen).

Maybe "Use overlays for all video."

[amp, 2016/12/16 19:25:03]

Done.

   bool force_video_overlays_;
 
-  // Prevent use of SurfaceView on Android. (Ignored when
-  // |force_video_overlays_| is true.)
-  bool disable_fullscreen_video_overlays_;
+  // Use overlays for fullscreen video.
+  // (Implied if |force_video_overlays_| is true.)
+  bool enable_fullscreen_video_overlays_;
 
   // Suppresses calls to OnPipelineError() after destruction / shutdown has been
   // started; prevents us from spuriously logging errors that are transient or
   // unimportant.
   bool suppress_destruction_errors_;
 
   // State indicating if it's okay to suspend or not. Updated on the first time
   // OnSuspendRequested() is called. If the state is UNKNOWN, the current frame
   // from the compositor will be queried to see if suspend is supported; the
   // state will be set to YES or NO respectively if a frame is available.
@@ skipping 27 matching lines @@
 
   // Whether the player is currently in autoplay muted state.
   bool autoplay_muted_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_