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

Side by Side Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_
6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
(...skipping 25 matching lines...) Expand all
36 bool IsEqual(const blink::WebMediaStream& web_stream) { 36 bool IsEqual(const blink::WebMediaStream& web_stream) {
37 return web_stream_.extraData() == web_stream.extraData(); 37 return web_stream_.extraData() == web_stream.extraData();
38 } 38 }
39 39
40 webrtc::MediaStreamInterface* webrtc_media_stream() { 40 webrtc::MediaStreamInterface* webrtc_media_stream() {
41 return webrtc_media_stream_.get(); 41 return webrtc_media_stream_.get();
42 } 42 }
43 43
44 protected: 44 protected:
45 // MediaStreamObserver implementation. 45 // MediaStreamObserver implementation.
46 virtual void TrackAdded(const blink::WebMediaStreamTrack& track) OVERRIDE; 46 virtual void TrackAdded(const blink::WebMediaStreamTrack& track) override;
47 virtual void TrackRemoved(const blink::WebMediaStreamTrack& track) OVERRIDE; 47 virtual void TrackRemoved(const blink::WebMediaStreamTrack& track) override;
48 48
49 private: 49 private:
50 void CreateAudioTrack(const blink::WebMediaStreamTrack& track); 50 void CreateAudioTrack(const blink::WebMediaStreamTrack& track);
51 void CreateVideoTrack(const blink::WebMediaStreamTrack& track); 51 void CreateVideoTrack(const blink::WebMediaStreamTrack& track);
52 52
53 blink::WebMediaStream web_stream_; 53 blink::WebMediaStream web_stream_;
54 54
55 // Pointer to a PeerConnectionDependencyFactory, owned by the RenderThread. 55 // Pointer to a PeerConnectionDependencyFactory, owned by the RenderThread.
56 // It's valid for the lifetime of RenderThread. 56 // It's valid for the lifetime of RenderThread.
57 PeerConnectionDependencyFactory* factory_; 57 PeerConnectionDependencyFactory* factory_;
58 58
59 scoped_refptr<webrtc::MediaStreamInterface> webrtc_media_stream_; 59 scoped_refptr<webrtc::MediaStreamInterface> webrtc_media_stream_;
60 ScopedVector<WebRtcVideoTrackAdapter> video_adapters_; 60 ScopedVector<WebRtcVideoTrackAdapter> video_adapters_;
61 61
62 DISALLOW_COPY_AND_ASSIGN (WebRtcMediaStreamAdapter); 62 DISALLOW_COPY_AND_ASSIGN (WebRtcMediaStreamAdapter);
63 }; 63 };
64 64
65 } // namespace content 65 } // namespace content
66 66
67 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_ 67 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698