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

Unified Diff: talk/app/webrtc/fakemediacontroller.h

Issue 1670153003: Introduce struct MediaConfig, with construction-time settings. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed Per's comments. Created 4 years, 10 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: talk/app/webrtc/fakemediacontroller.h
diff --git a/talk/app/webrtc/fakemediacontroller.h b/talk/app/webrtc/fakemediacontroller.h
index 5bf3e5fcf8556b914436c948d887468241ae2fae..c2567e968ca5f742f6510b07f245125b3c03c308 100644
--- a/talk/app/webrtc/fakemediacontroller.h
+++ b/talk/app/webrtc/fakemediacontroller.h
@@ -30,6 +30,7 @@
#include "talk/app/webrtc/mediacontroller.h"
#include "webrtc/base/checks.h"
+#include "webrtc/media/base/mediachannel.h"
namespace cricket {
@@ -46,6 +47,10 @@ class FakeMediaController : public webrtc::MediaControllerInterface {
cricket::ChannelManager* channel_manager() const override {
return channel_manager_;
}
+ const MediaConfig& config() const override {
+ static const MediaConfig media_config = MediaConfig();
perkj_webrtc 2016/02/10 10:41:26 remove static. make media_config_ a const member.
nisse-webrtc 2016/02/10 13:42:01 Done.
+ return media_config;
+ }
private:
cricket::ChannelManager* channel_manager_;
« no previous file with comments | « no previous file | talk/app/webrtc/mediacontroller.h » ('j') | talk/app/webrtc/peerconnectioninterface_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698