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

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

index d8fde670a0ec5b714023da1f440faa34254f33c4..2d76b99d2a3a0f88c715374e9dd744e0c861265d 100644

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

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

@@ -28,16 +28,12 @@

#ifndef TALK_SESSION_MEDIA_CHANNEL_H_

#define TALK_SESSION_MEDIA_CHANNEL_H_

-#include <string>

-#include <vector>

#include <map>

#include <set>

+#include <string>

#include <utility>

+#include <vector>

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

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

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

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

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

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

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

@@ -50,6 +46,10 @@

#include "webrtc/base/network.h"

#include "webrtc/base/sigslot.h"

#include "webrtc/base/window.h"

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

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

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

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

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

#include "webrtc/p2p/client/socketmonitor.h"