| Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| index 2bd2c77975194ae9e0914d7e2a0991d6e359151d..40cbb0876e027b42b3390387f8307a34776626a2 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| @@ -37,6 +37,7 @@
|
| #include "core/dom/SuspendableObject.h"
|
| #include "core/events/GenericEventQueue.h"
|
| #include "core/html/HTMLElement.h"
|
| +#include "core/html/media/MediaControls.h"
|
| #include "core/html/track/TextTrack.h"
|
| #include "platform/Supplementable.h"
|
| #include "platform/WebTaskRunner.h"
|
| @@ -61,7 +62,6 @@ class HTMLMediaElementControlsList;
|
| class HTMLSourceElement;
|
| class HTMLTrackElement;
|
| class KURL;
|
| -class MediaControls;
|
| class MediaError;
|
| class MediaStreamDescriptor;
|
| class HTMLMediaSource;
|
| @@ -104,6 +104,11 @@ class CORE_EXPORT HTMLMediaElement
|
| // for the given document.
|
| static void onMediaControlsEnabledChange(Document*);
|
|
|
| + // Called by the module implementing the media controls to notify of the
|
| + // factory to use. It should only be called once at process initialisation.
|
| + static void registerMediaControlsFactory(
|
| + std::unique_ptr<MediaControls::Factory>);
|
| +
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| DECLARE_VIRTUAL_TRACE_WRAPPERS();
|
| @@ -740,7 +745,7 @@ class CORE_EXPORT HTMLMediaElement
|
| friend class AutoplayUmaHelperTest;
|
| friend class Internals;
|
| friend class TrackDisplayUpdateScope;
|
| - friend class MediaControlsTest;
|
| + friend class MediaControlsImplTest;
|
| friend class HTMLMediaElementTest;
|
| friend class HTMLMediaElementEventListenersTest;
|
| friend class HTMLVideoElement;
|
|
|