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

Unified Diff: Source/core/html/shadow/MediaControls.h

Issue 157403002: Merge MediaControlsChromium into MediaControls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 months 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
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/shadow/MediaControls.h
diff --git a/Source/core/html/shadow/MediaControls.h b/Source/core/html/shadow/MediaControls.h
index fb3a6d940943d32bff101becc2d36cdd610a0ff5..3ac9dd106897b2c7480d4de2e921296d1d875197 100644
--- a/Source/core/html/shadow/MediaControls.h
+++ b/Source/core/html/shadow/MediaControls.h
@@ -41,13 +41,10 @@ class MediaPlayer;
class RenderBox;
class RenderMedia;
-// An abstract class with the media control elements that all ports support.
class MediaControls : public HTMLDivElement {
- public:
+public:
virtual ~MediaControls() {}
- // This function is to be implemented in your port-specific media
- // controls implementation since it will return a child instance.
static PassRefPtr<MediaControls> create(Document&);
virtual void setMediaController(MediaControllerInterface*);
@@ -66,7 +63,7 @@ class MediaControls : public HTMLDivElement {
virtual void playbackStopped();
virtual void updateStatusDisplay() { };
- virtual void updateCurrentTimeDisplay() = 0;
+ virtual void updateCurrentTimeDisplay();
virtual void showVolumeSlider();
virtual void changedMute();
@@ -89,10 +86,13 @@ class MediaControls : public HTMLDivElement {
virtual void showTextTrackDisplay();
virtual void hideTextTrackDisplay();
virtual void updateTextTrackDisplay();
+ virtual void insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement>);
protected:
explicit MediaControls(Document&);
+ bool initializeControls(Document&);
+
virtual void defaultEventHandler(Event*) OVERRIDE;
bool containsRelatedTarget(Event*);
@@ -122,6 +122,9 @@ private:
virtual bool isMediaControls() const OVERRIDE FINAL { return true; }
virtual const AtomicString& shadowPseudoId() const OVERRIDE;
+
+ MediaControlTimeRemainingDisplayElement* m_durationDisplay;
+ MediaControlPanelEnclosureElement* m_enclosure;
};
DEFINE_NODE_TYPE_CASTS(MediaControls, isMediaControls());
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698