Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: talk/session/media/mediasession.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Disable sign-compare warning on Win Clang 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:
View side-by-side diff with in-line comments
Download patch
« talk/app/webrtc/java/jni/androidmediadecoder_jni.cc ('K') | « talk/session/media/mediamonitor.h ('k') | talk/session/media/mediasession.cc » ('j') | webrtc/media/base/cryptoparams.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/session/media/mediasession.h
diff --git a/talk/session/media/mediasession.h b/talk/session/media/mediasession.h
index 15402746650d4f5205d5b17d75b738f077dd8e65..17a2c1be6f4d6b8ac3c413891f35d9b46984e803 100644
--- a/talk/session/media/mediasession.h
+++ b/talk/session/media/mediasession.h
@@ -34,16 +34,16 @@
#include <string>
#include <vector>
-#include "talk/media/base/codec.h"
-#include "talk/media/base/constants.h"
-#include "talk/media/base/cryptoparams.h"
-#include "talk/media/base/mediachannel.h"
-#include "talk/media/base/mediaengine.h" // For DataChannelType
-#include "talk/media/base/streamparams.h"
+#include "webrtc/base/scoped_ptr.h"
+#include "webrtc/media/base/codec.h"
+#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/cryptoparams.h"
+#include "webrtc/media/base/mediachannel.h"
+#include "webrtc/media/base/mediaengine.h" // For DataChannelType
+#include "webrtc/media/base/streamparams.h"
#include "webrtc/p2p/base/sessiondescription.h"
#include "webrtc/p2p/base/transport.h"
#include "webrtc/p2p/base/transportdescriptionfactory.h"
-#include "webrtc/base/scoped_ptr.h"
namespace cricket {
« talk/app/webrtc/java/jni/androidmediadecoder_jni.cc ('K') | « talk/session/media/mediamonitor.h ('k') | talk/session/media/mediasession.cc » ('j') | webrtc/media/base/cryptoparams.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698