| Index: Source/modules/mediastream/MediaStream.h
|
| diff --git a/Source/modules/mediastream/MediaStream.h b/Source/modules/mediastream/MediaStream.h
|
| index 50767ae16c35df33b9da0ca100e20d9ab3c741b2..8414760e033a6172b63cd660e456ad9f497b8915 100644
|
| --- a/Source/modules/mediastream/MediaStream.h
|
| +++ b/Source/modules/mediastream/MediaStream.h
|
| @@ -37,7 +37,7 @@ namespace blink {
|
|
|
| class ExceptionState;
|
|
|
| -class MediaStream FINAL
|
| +class MediaStream final
|
| : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStream>
|
| , public URLRegistrable
|
| , public MediaStreamDescriptorClient
|
| @@ -77,29 +77,29 @@ public:
|
| void trackEnded();
|
|
|
| // MediaStreamDescriptorClient
|
| - virtual void streamEnded() OVERRIDE;
|
| + virtual void streamEnded() override;
|
|
|
| MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
|
|
|
| // EventTarget
|
| - virtual const AtomicString& interfaceName() const OVERRIDE;
|
| - virtual ExecutionContext* executionContext() const OVERRIDE;
|
| + virtual const AtomicString& interfaceName() const override;
|
| + virtual ExecutionContext* executionContext() const override;
|
|
|
| // URLRegistrable
|
| - virtual URLRegistry& registry() const OVERRIDE;
|
| + virtual URLRegistry& registry() const override;
|
|
|
| - virtual void trace(Visitor*) OVERRIDE;
|
| + virtual void trace(Visitor*) override;
|
|
|
| private:
|
| MediaStream(ExecutionContext*, MediaStreamDescriptor*);
|
| MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks);
|
|
|
| // ContextLifecycleObserver
|
| - virtual void contextDestroyed() OVERRIDE;
|
| + virtual void contextDestroyed() override;
|
|
|
| // MediaStreamDescriptorClient
|
| - virtual void addRemoteTrack(MediaStreamComponent*) OVERRIDE;
|
| - virtual void removeRemoteTrack(MediaStreamComponent*) OVERRIDE;
|
| + virtual void addRemoteTrack(MediaStreamComponent*) override;
|
| + virtual void removeRemoteTrack(MediaStreamComponent*) override;
|
|
|
| void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>);
|
| void scheduledEventTimerFired(Timer<MediaStream>*);
|
|
|