content/renderer/media/webrtc/webrtc_media_stream_adapter.h - Issue 272043003: Renamed MediaStreamDependencyFactory to PeerConnectionDependencyFactory.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter.h

Issue 272043003: Renamed MediaStreamDependencyFactory to PeerConnectionDependencyFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: media_stream_dependency_factory_unittest.cc Created 6 years, 7 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

« content/renderer/media/rtc_peer_connection_handler.cc ('K') | « content/renderer/media/webrtc/video_destination_handler.h ('k') | content/renderer/media/webrtc/webrtc_media_stream_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webrtc/webrtc_media_stream_adapter.h

diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter.h b/content/renderer/media/webrtc/webrtc_media_stream_adapter.h

index 9c64b441e76ff5ea5b1880ff11e094d56916b4eb..d5983224ed38dee74d871433e50514214c48258b 100644

--- a/content/renderer/media/webrtc/webrtc_media_stream_adapter.h

+++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter.h

@@ -16,7 +16,7 @@

namespace content {

-class MediaStreamDependencyFactory;

+class PeerConnectionDependencyFactory;

// WebRtcMediaStreamAdapter is an adapter between a blink::WebMediaStream

// object and a webrtc MediaStreams that is currently sent on a PeerConnection.

@@ -30,7 +30,7 @@ class CONTENT_EXPORT WebRtcMediaStreamAdapter

: NON_EXPORTED_BASE(public MediaStreamObserver) {

public:

WebRtcMediaStreamAdapter(const blink::WebMediaStream& web_stream,

- MediaStreamDependencyFactory* factory);

+ PeerConnectionDependencyFactory* factory);

virtual ~WebRtcMediaStreamAdapter();

bool IsEqual(const blink::WebMediaStream& web_stream) {

@@ -52,9 +52,9 @@ class CONTENT_EXPORT WebRtcMediaStreamAdapter

blink::WebMediaStream web_stream_;

- // Pointer to a MediaStreamDependencyFactory, owned by the RenderThread.

+ // Pointer to a PeerConnectionDependencyFactory, owned by the RenderThread.

// It's valid for the lifetime of RenderThread.

- MediaStreamDependencyFactory* factory_;

+ PeerConnectionDependencyFactory* factory_;

scoped_refptr<webrtc::MediaStreamInterface> webrtc_media_stream_;

ScopedVector<WebRtcVideoTrackAdapter> video_adapters_;