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

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

index 445b3794776031cff6d5a6b16e2d5d281ecaab53..0a02e9601d716a468a42215c801278c8e7a4a610 100644

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

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

@@ -30,11 +30,11 @@

#ifndef TALK_SESSION_MEDIA_MEDIAMONITOR_H_

#define TALK_SESSION_MEDIA_MEDIAMONITOR_H_

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

#include "webrtc/base/criticalsection.h"

#include "webrtc/base/sigslot.h"

#include "webrtc/base/thread.h"

#include "webrtc/base/thread_annotations.h"

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

namespace cricket {