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

Side by Side Diff: webrtc/voice_engine/channel_manager.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
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/channel_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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_VOICE_ENGINE_CHANNEL_MANAGER_H 11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
12 #define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H 12 #define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
13 13
14 #include <memory> 14 #include <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/rtc_base/constructormagic.h"
18 #include "webrtc/base/criticalsection.h" 18 #include "webrtc/rtc_base/criticalsection.h"
19 #include "webrtc/base/random.h" 19 #include "webrtc/rtc_base/random.h"
20 #include "webrtc/base/scoped_ref_ptr.h" 20 #include "webrtc/rtc_base/scoped_ref_ptr.h"
21 #include "webrtc/system_wrappers/include/atomic32.h" 21 #include "webrtc/system_wrappers/include/atomic32.h"
22 #include "webrtc/typedefs.h" 22 #include "webrtc/typedefs.h"
23 #include "webrtc/voice_engine/include/voe_base.h" 23 #include "webrtc/voice_engine/include/voe_base.h"
24 24
25 namespace webrtc { 25 namespace webrtc {
26 26
27 class AudioDecoderFactory; 27 class AudioDecoderFactory;
28 28
29 namespace voe { 29 namespace voe {
30 30
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 // For generation of random ssrc:s. 120 // For generation of random ssrc:s.
121 webrtc::Random random_; 121 webrtc::Random random_;
122 122
123 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager); 123 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager);
124 }; 124 };
125 } // namespace voe 125 } // namespace voe
126 } // namespace webrtc 126 } // namespace webrtc
127 127
128 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H 128 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/channel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698