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

Side by Side Diff: webrtc/media/engine/fakewebrtcvoiceengine.h

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ 11 #ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
12 #define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ 12 #define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
13 13
14 #include <map> 14 #include <map>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/checks.h"
18 #include "webrtc/media/engine/webrtcvoe.h" 17 #include "webrtc/media/engine/webrtcvoe.h"
18 #include "webrtc/rtc_base/checks.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 namespace voe { 21 namespace voe {
22 class TransmitMixer; 22 class TransmitMixer;
23 } // namespace voe 23 } // namespace voe
24 } // namespace webrtc 24 } // namespace webrtc
25 25
26 namespace cricket { 26 namespace cricket {
27 27
28 #define WEBRTC_CHECK_CHANNEL(channel) \ 28 #define WEBRTC_CHECK_CHANNEL(channel) \
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 std::map<int, Channel*> channels_; 129 std::map<int, Channel*> channels_;
130 bool fail_create_channel_ = false; 130 bool fail_create_channel_ = false;
131 webrtc::voe::TransmitMixer* transmit_mixer_ = nullptr; 131 webrtc::voe::TransmitMixer* transmit_mixer_ = nullptr;
132 132
133 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FakeWebRtcVoiceEngine); 133 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FakeWebRtcVoiceEngine);
134 }; 134 };
135 135
136 } // namespace cricket 136 } // namespace cricket
137 137
138 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ 138 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/fakewebrtcvideoengine.h ('k') | webrtc/media/engine/internaldecoderfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698