Merge MediaControlsAndroid into MediaControls

Source/core/html/shadow/MediaControls.h

Index: Source/core/html/shadow/MediaControls.h
diff --git a/Source/core/html/shadow/MediaControls.h b/Source/core/html/shadow/MediaControls.h
index 7c4da46681dd00927f365160348ec83e146c472c..b3a5f07fc2076782beb0ba675911a562571209eb 100644
--- a/Source/core/html/shadow/MediaControls.h
+++ b/Source/core/html/shadow/MediaControls.h
@@ -27,36 +27,28 @@
 #ifndef MediaControls_h
 #define MediaControls_h
 
-#include "core/events/MouseEvent.h"
 #include "core/html/HTMLDivElement.h"
 #include "core/html/shadow/MediaControlElements.h"
-#include "core/rendering/RenderTheme.h"
 
 namespace WebCore {
 
 class Document;
 class Event;
-class MediaPlayer;
 
-class RenderBox;
-class RenderMedia;
-
-class MediaControls : public HTMLDivElement {
+class MediaControls FINAL : public HTMLDivElement {
 public:
-    virtual ~MediaControls() {}
-
     static PassRefPtr<MediaControls> create(Document&);
 
-    virtual void setMediaController(MediaControllerInterface*);
+    void setMediaController(MediaControllerInterface*);
 
     void reset();
 
     void show();
     void hide();
 
-    virtual void playbackStarted();
+    void playbackStarted();
     void playbackProgressed();
-    virtual void playbackStopped();
+    void playbackStopped();
 
     void updateCurrentTimeDisplay();
 
@@ -72,19 +64,15 @@ public:
 
     void updateTextTrackDisplay();
 
-protected:
+private:
     explicit MediaControls(Document&);
 
-    virtual bool initializeControls(Document&);
+    bool initializeControls(Document&);
 
-    virtual bool shouldHideControls();
-
-    virtual void insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement>);
-
-private:
     void makeOpaque();
     void makeTransparent();
 
+    bool shouldHideFullscreenControls();
     void hideFullscreenControlsTimerFired(Timer<MediaControls>*);
     void startHideFullscreenControlsTimer();
     void stopHideFullscreenControlsTimer();
@@ -94,7 +82,7 @@ private:
     void hideTextTrackDisplay();
 
     // Node
-    virtual bool isMediaControls() const OVERRIDE FINAL { return true; }
+    virtual bool isMediaControls() const OVERRIDE { return true; }
     virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; }
     virtual void defaultEventHandler(Event*) OVERRIDE;
     bool containsRelatedTarget(Event*);
@@ -111,6 +99,8 @@ private:
     MediaControlTextTrackContainerElement* m_textDisplayContainer;
 
     // Media control elements.
+    MediaControlOverlayPlayButtonElement* m_overlayPlayButton;
+    MediaControlOverlayEnclosureElement* m_overlayEnclosure;
     MediaControlPlayButtonElement* m_playButton;
     MediaControlCurrentTimeDisplayElement* m_currentTimeDisplay;
     MediaControlTimelineElement* m_timeline;