webrtc/api/webrtcsession.cc - Issue 1691463002: Move talk/session/media -> webrtc/pc

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/api/webrtcsession.cc

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Last rebase 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/api/webrtcsession.cc

diff --git a/webrtc/api/webrtcsession.cc b/webrtc/api/webrtcsession.cc

index 92a5f0aec45979b80cea44b430cbaa9af80a726f..56bea6403d7a295bc7382c2c8c11b2fa25bb7d4e 100644

--- a/webrtc/api/webrtcsession.cc

+++ b/webrtc/api/webrtcsession.cc

@@ -17,9 +17,6 @@

#include <utility>

#include <vector>

-#include "talk/session/media/channel.h"

-#include "talk/session/media/channelmanager.h"

-#include "talk/session/media/mediasession.h"

#include "webrtc/api/jsepicecandidate.h"

#include "webrtc/api/jsepsessiondescription.h"

#include "webrtc/api/mediaconstraintsinterface.h"

@@ -38,6 +35,9 @@

#include "webrtc/media/base/videocapturer.h"

#include "webrtc/p2p/base/portallocator.h"

#include "webrtc/p2p/base/transportchannel.h"

+#include "webrtc/pc/channel.h"

+#include "webrtc/pc/channelmanager.h"

+#include "webrtc/pc/mediasession.h"

using cricket::ContentInfo;

using cricket::ContentInfos;

« no previous file with comments | « webrtc/api/webrtcsession.h ('k') | webrtc/api/webrtcsession_unittest.cc » ('j') | no next file with comments »