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

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

Issue 143703007: Tweak the public/protected/private sections of MediaControls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase 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 | « no previous file | 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 6014d4876cf48b8d7d456b8e56d2f6825e78a5a2..c5e86af2cabb577400d8f56e3567409818b74718 100644
--- a/Source/core/html/shadow/MediaControls.h
+++ b/Source/core/html/shadow/MediaControls.h
@@ -53,9 +53,6 @@ public:
void show();
void hide();
- void makeOpaque();
- void makeTransparent();
- virtual bool shouldHideControls();
void bufferingProgressed();
virtual void playbackStarted();
@@ -75,7 +72,20 @@ public:
void enteredFullscreen();
void exitedFullscreen();
- virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; }
+ void updateTextTrackDisplay();
+
+protected:
+ explicit MediaControls(Document&);
+
+ virtual bool initializeControls(Document&);
+
+ virtual bool shouldHideControls();
+
+ virtual void insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement>);
+
+private:
+ void makeOpaque();
+ void makeTransparent();
void hideFullscreenControlsTimerFired(Timer<MediaControls>*);
void startHideFullscreenControlsTimer();
@@ -84,18 +94,16 @@ public:
void createTextTrackDisplay();
void showTextTrackDisplay();
void hideTextTrackDisplay();
- void updateTextTrackDisplay();
- virtual void insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement>);
-
-protected:
- explicit MediaControls(Document&);
-
- virtual bool initializeControls(Document&);
+ // Node
+ virtual bool isMediaControls() const OVERRIDE FINAL { return true; }
+ virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; }
virtual void defaultEventHandler(Event*) OVERRIDE;
-
bool containsRelatedTarget(Event*);
+ // Element
+ virtual const AtomicString& shadowPseudoId() const OVERRIDE;
+
MediaControllerInterface* m_mediaController;
// Container for the media control elements.
@@ -112,18 +120,12 @@ protected:
MediaControlPanelVolumeSliderElement* m_volumeSlider;
MediaControlToggleClosedCaptionsButtonElement* m_toggleClosedCaptionsButton;
MediaControlFullscreenButtonElement* m_fullScreenButton;
+ MediaControlTimeRemainingDisplayElement* m_durationDisplay;
+ MediaControlPanelEnclosureElement* m_enclosure;
Timer<MediaControls> m_hideFullscreenControlsTimer;
bool m_isFullscreen;
bool m_isMouseOverControls;
-
-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 | « no previous file | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698