webrtc/examples/peerconnection/client/conductor.cc - Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3)

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 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)

Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 6 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 7c410274749a6d284ef89ff2cc8a4ae082c1a0d5..8a1b9a276e2267ea60db21b26662868f4d018aef 100644

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

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

@@ -15,12 +15,12 @@

#include <vector>

#include "webrtc/api/test/fakeconstraints.h"

-#include "webrtc/base/checks.h"

-#include "webrtc/base/json.h"

-#include "webrtc/base/logging.h"

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

#include "webrtc/media/engine/webrtcvideocapturerfactory.h"

#include "webrtc/modules/video_capture/video_capture_factory.h"

+#include "webrtc/rtc_base/checks.h"

+#include "webrtc/rtc_base/json.h"

+#include "webrtc/rtc_base/logging.h"

// Names used for a IceCandidate JSON object.

const char kCandidateSdpMidName[] = "sdpMid";