talk/session/media/channelmanager.h - Issue 1397973002: Merging BaseSession code into WebRtcSession.

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 1397973002: Merging BaseSession code into WebRtcSession. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Merging with master (MediaStreamSignaling removal affected WebRtcSession). Created 5 years, 2 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 e0a0fb2a704a41875d08415d70a59835e84054d3..c17a60fe01f83f381777b6340790e252d8d93567 100644

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

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

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

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

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

-#include "webrtc/p2p/base/session.h"

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

#include "webrtc/base/criticalsection.h"

#include "webrtc/base/fileutils.h"