Start using the mediaControlsOverlayPlayButtonEnabled setting

Source/core/html/shadow/MediaControls.cpp

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/shadow/MediaControls.h"
 
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "core/events/MouseEvent.h"
+#include "core/frame/Settings.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/MediaController.h"
 #include "core/rendering/RenderTheme.h"
 
 namespace WebCore {
 
-#if OS(ANDROID)
-static const bool needOverlayPlayButton = true;
-#else
-static const bool needOverlayPlayButton = false;
-#endif
-
 static const double timeWithoutMouseMovementBeforeHidingMediaControls = 3;
 
 MediaControls::MediaControls(HTMLMediaElement& mediaElement)
     : HTMLDivElement(mediaElement.document())
     , m_mediaElement(mediaElement)
     , m_panel(0)
     , m_textDisplayContainer(0)
     , m_overlayPlayButton(0)
     , m_overlayEnclosure(0)
     , m_playButton(0)
@@ skipping 18 matching lines @@
     if (controls->initializeControls())
         return controls.release();
 
     return nullptr;
 }
 
 bool MediaControls::initializeControls()
 {
     TrackExceptionState exceptionState;
 
-    if (needOverlayPlayButton) {
+    if (document().settings() && document().settings()->mediaControlsOverlayPlayButtonEnabled()) {
         RefPtr<MediaControlOverlayEnclosureElement> overlayEnclosure = MediaControlOverlayEnclosureElement::create(*this);
         RefPtr<MediaControlOverlayPlayButtonElement> overlayPlayButton = MediaControlOverlayPlayButtonElement::create(*this);
         m_overlayPlayButton = overlayPlayButton.get();
         overlayEnclosure->appendChild(overlayPlayButton.release(), exceptionState);
         if (exceptionState.hadException())
             return false;
 
         m_overlayEnclosure = overlayEnclosure.get();
         appendChild(overlayEnclosure.release(), exceptionState);
         if (exceptionState.hadException())
@@ skipping 344 matching lines @@
 
 void MediaControls::updateTextTrackDisplay()
 {
     if (!m_textDisplayContainer)
         createTextTrackDisplay();
 
     m_textDisplayContainer->updateDisplay();
 }
 
 }