talk/session/media/channelmanager.h - 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: talk/session/media/channelmanager.h

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

Patch Set: Rename back test to libjingle_media_unittest Created 4 years, 11 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: talk/session/media/channelmanager.h

diff --git a/talk/session/media/channelmanager.h b/talk/session/media/channelmanager.h

index f69bf9a2935c2a25bca79a555e2e3e49a4118031..59c1df081f3fe9be93dc34913bdfc7a62331fa7a 100644

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

+++ b/talk/session/media/channelmanager.h

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

#include <string>

#include <vector>

-#include "talk/media/base/capturemanager.h"

-#include "talk/media/base/mediaengine.h"

#include "talk/session/media/voicechannel.h"

#include "webrtc/base/criticalsection.h"

#include "webrtc/base/fileutils.h"

#include "webrtc/base/sigslotrepeater.h"

#include "webrtc/base/thread.h"

+#include "webrtc/media/base/capturemanager.h"

+#include "webrtc/media/base/mediaengine.h"

namespace webrtc {

class MediaControllerInterface;