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

Unified Diff: webrtc/pc/peerconnectionfactory.h

Issue 2794943002: Delete MediaController class, move Call ownership to PeerConnection. (Closed)
Patch Set: Revert DCHECK addition. Created 3 years, 8 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
Index: webrtc/pc/peerconnectionfactory.h
diff --git a/webrtc/pc/peerconnectionfactory.h b/webrtc/pc/peerconnectionfactory.h
index 53c6745ba9878bd1b791d90feec93a1875fdc20a..184a87ef6500e3cbec131e44f3364e4dd635f18f 100644
--- a/webrtc/pc/peerconnectionfactory.h
+++ b/webrtc/pc/peerconnectionfactory.h
@@ -20,7 +20,6 @@
#include "webrtc/base/thread.h"
#include "webrtc/base/rtccertificategenerator.h"
#include "webrtc/pc/channelmanager.h"
-#include "webrtc/pc/mediacontroller.h"
namespace rtc {
class BasicNetworkManager;
@@ -96,12 +95,10 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface {
// TODO(ivoc) Remove after Chrome is updated.
void StopRtcEventLog() override {}
- virtual webrtc::MediaControllerInterface* CreateMediaController(
- const cricket::MediaConfig& config,
- RtcEventLog* event_log) const;
virtual cricket::TransportController* CreateTransportController(
cricket::PortAllocator* port_allocator,
bool redetermine_role_on_ice_restart);
+ virtual cricket::ChannelManager* channel_manager();
virtual rtc::Thread* signaling_thread();
virtual rtc::Thread* worker_thread();
virtual rtc::Thread* network_thread();

Powered by Google App Engine
This is Rietveld 408576698