content/renderer/media/mock_web_rtc_peer_connection_handler_client.h - Issue 12084088: Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream

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/mock_web_rtc_peer_connection_handler_client.h

Issue 12084088: Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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 | « content/renderer/media/media_stream_impl_unittest.cc ('k') | content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/mock_web_rtc_peer_connection_handler_client.h

diff --git a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h

index 69dc00e01323dbb0f93342fc616988ba01238319..99ee958498cc24909bacb743ebc959229830c2e3 100644

--- a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h

+++ b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h

@@ -9,7 +9,7 @@

#include "base/basictypes.h"

#include "base/compiler_specific.h"

-#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamDescriptor.h"

+#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"

#include "third_party/WebKit/Source/Platform/chromium/public/WebRTCICECandidate.h"

#include "third_party/WebKit/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h"

@@ -28,9 +28,9 @@ class MockWebRTCPeerConnectionHandlerClient

virtual void didChangeSignalingState(SignalingState) OVERRIDE;

virtual void didChangeICEState(ICEState) OVERRIDE;

virtual void didAddRemoteStream(

- const WebKit::WebMediaStreamDescriptor& stream_descriptor) OVERRIDE;

+ const WebKit::WebMediaStream& stream_descriptor) OVERRIDE;

virtual void didRemoveRemoteStream(

- const WebKit::WebMediaStreamDescriptor& stream_descriptor) OVERRIDE;

+ const WebKit::WebMediaStream& stream_descriptor) OVERRIDE;

bool renegotiate() const { return renegotiate_; }