content/renderer/media/webrtc/webrtc_media_stream_adapter.h - Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545

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 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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:

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 3b8a3e75764cf59674ca4b4bdd72acc3d75b51ea..eba23db75dda589d2d50ebddde2215724c2c5a10 100644

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

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

@@ -11,7 +11,7 @@

#include "content/common/content_export.h"

#include "content/renderer/media/media_stream.h"

#include "third_party/WebKit/public/platform/WebMediaStream.h"

-#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"

+#include "third_party/webrtc/api/mediastreaminterface.h"

namespace content {