webrtc/examples/peerconnection/client/conductor.cc - Issue 1587193006: Move talk/media to webrtc/media

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: webrtc/examples/peerconnection/client/conductor.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) 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: webrtc/examples/peerconnection/client/conductor.cc

diff --git a/webrtc/examples/peerconnection/client/conductor.cc b/webrtc/examples/peerconnection/client/conductor.cc

index 883f44a77bc17ab04e38c5457a6f47d564a8d898..3a40fd947364537e6969189a6c32791fa2611c22 100644

--- a/webrtc/examples/peerconnection/client/conductor.cc

+++ b/webrtc/examples/peerconnection/client/conductor.cc

@@ -13,13 +13,13 @@

#include <utility>

#include <vector>

-#include "talk/app/webrtc/videosourceinterface.h"

-#include "webrtc/examples/peerconnection/client/defaults.h"

-#include "talk/media/devices/devicemanager.h"

#include "talk/app/webrtc/test/fakeconstraints.h"

+#include "talk/app/webrtc/videosourceinterface.h"

#include "webrtc/base/common.h"

#include "webrtc/base/json.h"

#include "webrtc/base/logging.h"

+#include "webrtc/examples/peerconnection/client/defaults.h"

+#include "webrtc/media/devices/devicemanager.h"

// Names used for a IceCandidate JSON object.

const char kCandidateSdpMidName[] = "sdpMid";