Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2015 Google Inc. | 3 * Copyright 2015 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 39 webrtc::Call* call) | 39 webrtc::Call* call) |
| 40 : channel_manager_(channel_manager), call_(call) { | 40 : channel_manager_(channel_manager), call_(call) { |
| 41 RTC_DCHECK(nullptr != channel_manager_); | 41 RTC_DCHECK(nullptr != channel_manager_); |
| 42 RTC_DCHECK(nullptr != call_); | 42 RTC_DCHECK(nullptr != call_); |
| 43 } | 43 } |
| 44 ~FakeMediaController() override {} | 44 ~FakeMediaController() override {} |
| 45 webrtc::Call* call_w() override { return call_; } | 45 webrtc::Call* call_w() override { return call_; } |
| 46 cricket::ChannelManager* channel_manager() const override { | 46 cricket::ChannelManager* channel_manager() const override { |
| 47 return channel_manager_; | 47 return channel_manager_; |
| 48 } | 48 } |
| 49 const webrtc::MediaConfig* config() const override { | |
|
pthatcher1
2016/02/05 17:11:30
I'd say make it a reference.
| |
| 50 static const webrtc::MediaConfig media_config = webrtc::MediaConfig(); | |
| 51 return &media_config; | |
| 52 } | |
| 49 | 53 |
| 50 private: | 54 private: |
| 51 cricket::ChannelManager* channel_manager_; | 55 cricket::ChannelManager* channel_manager_; |
| 52 webrtc::Call* call_; | 56 webrtc::Call* call_; |
| 53 }; | 57 }; |
| 54 } // namespace cricket | 58 } // namespace cricket |
| 55 #endif // TALK_APP_WEBRTC_FAKEMEDIACONTROLLER_H_ | 59 #endif // TALK_APP_WEBRTC_FAKEMEDIACONTROLLER_H_ |
| OLD | NEW |