content/renderer/media/webrtc/peer_connection_dependency_factory.cc - 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/peer_connection_dependency_factory.cc

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/media/webrtc/peer_connection_dependency_factory.h ('k') | content/renderer/media/webrtc/track_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webrtc/peer_connection_dependency_factory.cc

diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc

index a2e3f181293aa9ab8882e332226225069aee0776..966a295fdf8fdd3fa61f66ff58cc7a996eb21dc2 100644

--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc

+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc

@@ -65,7 +65,7 @@

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

#include "third_party/WebKit/public/web/WebDocument.h"

#include "third_party/WebKit/public/web/WebFrame.h"

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

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

#include "third_party/webrtc/base/ssladapter.h"

#include "third_party/webrtc/modules/video_coding/codecs/h264/include/h264.h"