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

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

Issue 185363011: Merge/rename two MediaControlElements into their parent classes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rm m_muteButton->show() 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
Index: Source/core/html/shadow/MediaControls.h
diff --git a/Source/core/html/shadow/MediaControls.h b/Source/core/html/shadow/MediaControls.h
index cb060ac81b46c2db52565fb3e922d64d90c71204..7869704bde056a4db1b95f4fa4b4c9d1090eaa56 100644
--- a/Source/core/html/shadow/MediaControls.h
+++ b/Source/core/html/shadow/MediaControls.h
@@ -115,8 +115,8 @@ private:
MediaControlPlayButtonElement* m_playButton;
MediaControlCurrentTimeDisplayElement* m_currentTimeDisplay;
MediaControlTimelineElement* m_timeline;
- MediaControlPanelMuteButtonElement* m_panelMuteButton;
- MediaControlPanelVolumeSliderElement* m_volumeSlider;
+ MediaControlMuteButtonElement* m_muteButton;
+ MediaControlVolumeSliderElement* m_volumeSlider;
MediaControlToggleClosedCaptionsButtonElement* m_toggleClosedCaptionsButton;
MediaControlFullscreenButtonElement* m_fullScreenButton;
MediaControlTimeRemainingDisplayElement* m_durationDisplay;

Powered by Google App Engine
This is Rietveld 408576698