webrtc/pc/channelmanager.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/pc/channelmanager.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/pc/channelmanager.cc

diff --git a/talk/session/media/channelmanager.cc b/webrtc/pc/channelmanager.cc

similarity index 99%

rename from talk/session/media/channelmanager.cc

rename to webrtc/pc/channelmanager.cc

index 8124f28364243e90382e096998618702b26452c0..ac2df8b0b8446df83e6321dd241ccc08b9840d69 100644

--- a/talk/session/media/channelmanager.cc

+++ b/webrtc/pc/channelmanager.cc

@@ -25,7 +25,7 @@

* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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

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

#ifdef HAVE_CONFIG_H

#include <config.h>

@@ -33,7 +33,6 @@

#include <algorithm>

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

#include "webrtc/api/mediacontroller.h"

#include "webrtc/base/bind.h"

#include "webrtc/base/common.h"

@@ -50,6 +49,7 @@

#ifdef HAVE_SCTP

#include "webrtc/media/sctp/sctpdataengine.h"

#endif

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

namespace cricket {

« no previous file with comments | « webrtc/pc/channelmanager.h ('k') | webrtc/pc/channelmanager_unittest.cc » ('j') | no next file with comments »