talk/session/media/channelmanager.cc - Issue 1610243002: Move talk/app/webrtc to webrtc/api

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.cc

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

Patch Set: Removed processing of api.gyp for Chromium builds 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: talk/session/media/channelmanager.cc

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

index bfecb5897c794486f6968397c630cbaa64583ffe..8124f28364243e90382e096998618702b26452c0 100644

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

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

@@ -33,16 +33,8 @@

#include <algorithm>

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

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

-#include "webrtc/media/base/device.h"

-#include "webrtc/media/base/hybriddataengine.h"

-#include "webrtc/media/base/rtpdataengine.h"

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

-#ifdef HAVE_SCTP

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

-#endif

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

+#include "webrtc/api/mediacontroller.h"

#include "webrtc/base/bind.h"

#include "webrtc/base/common.h"

#include "webrtc/base/logging.h"

@@ -50,6 +42,14 @@

#include "webrtc/base/stringencode.h"

#include "webrtc/base/stringutils.h"

#include "webrtc/base/trace_event.h"

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

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

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

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

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

+#ifdef HAVE_SCTP

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

+#endif

namespace cricket {

« no previous file with comments | « talk/peerconnection_unittests.isolate ('k') | talk/session/media/channelmanager_unittest.cc » ('j') | no next file with comments »