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

Unified Diff: Source/core/html/shadow/MediaControlsChromiumAndroid.cpp

Issue 144083003: Revert of 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/html/shadow/MediaControlsChromiumAndroid.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/shadow/MediaControlsChromiumAndroid.cpp
diff --git a/Source/core/html/shadow/MediaControlsChromiumAndroid.cpp b/Source/core/html/shadow/MediaControlsChromiumAndroid.cpp
index a88ceafa609d4d311501c53f6041401024285dc3..f81c9309b37d7b509e7d11a6ab2c6fde35fadb7a 100644
--- a/Source/core/html/shadow/MediaControlsChromiumAndroid.cpp
+++ b/Source/core/html/shadow/MediaControlsChromiumAndroid.cpp
@@ -32,13 +32,18 @@
namespace WebCore {
MediaControlsChromiumAndroid::MediaControlsChromiumAndroid(Document& document)
- : MediaControls(document)
+ : MediaControlsChromium(document)
, m_overlayPlayButton(0)
, m_overlayEnclosure(0)
{
}
PassRefPtr<MediaControls> MediaControls::create(Document& document)
+{
+ return MediaControlsChromiumAndroid::createControls(document);
+}
+
+PassRefPtr<MediaControlsChromiumAndroid> MediaControlsChromiumAndroid::createControls(Document& document)
{
if (!document.page())
return 0;
@@ -71,19 +76,19 @@
m_overlayPlayButton->setMediaController(controller);
if (m_overlayEnclosure)
m_overlayEnclosure->setMediaController(controller);
- MediaControls::setMediaController(controller);
+ MediaControlsChromium::setMediaController(controller);
}
void MediaControlsChromiumAndroid::playbackStarted()
{
m_overlayPlayButton->updateDisplayType();
- MediaControls::playbackStarted();
+ MediaControlsChromium::playbackStarted();
}
void MediaControlsChromiumAndroid::playbackStopped()
{
m_overlayPlayButton->updateDisplayType();
- MediaControls::playbackStopped();
+ MediaControlsChromium::playbackStopped();
}
void MediaControlsChromiumAndroid::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement> textTrackContainer)
« no previous file with comments | « Source/core/html/shadow/MediaControlsChromiumAndroid.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698