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

Side by Side Diff: webrtc/voice_engine/channel_manager.h

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month 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/dtmf_inband.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 <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/scoped_ptr.h" 17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/call/rtc_event_log.h" 18 #include "webrtc/call/rtc_event_log.h"
19 #include "webrtc/system_wrappers/interface/atomic32.h" 19 #include "webrtc/system_wrappers/include/atomic32.h"
20 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 20 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
21 #include "webrtc/typedefs.h" 21 #include "webrtc/typedefs.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 class Config; 25 class Config;
26 26
27 namespace voe { 27 namespace voe {
28 28
29 class Channel; 29 class Channel;
30 30
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 const Config& config_; 129 const Config& config_;
130 rtc::scoped_ptr<RtcEventLog> event_log_; 130 rtc::scoped_ptr<RtcEventLog> event_log_;
131 131
132 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager); 132 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager);
133 }; 133 };
134 } // namespace voe 134 } // namespace voe
135 } // namespace webrtc 135 } // namespace webrtc
136 136
137 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H 137 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/dtmf_inband.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698