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

Side by Side Diff: webrtc/pc/channelmanager.cc

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/pc/channelmanager.h ('k') | webrtc/pc/channelmanager_unittest.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 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 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 #include "webrtc/pc/channelmanager.h" 11 #include "webrtc/pc/channelmanager.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 14
15 #include "webrtc/base/bind.h"
16 #include "webrtc/base/checks.h"
17 #include "webrtc/base/logging.h"
18 #include "webrtc/base/stringencode.h"
19 #include "webrtc/base/stringutils.h"
20 #include "webrtc/base/trace_event.h"
21 #include "webrtc/media/base/device.h" 15 #include "webrtc/media/base/device.h"
22 #include "webrtc/media/base/rtpdataengine.h" 16 #include "webrtc/media/base/rtpdataengine.h"
23 #include "webrtc/pc/srtpfilter.h" 17 #include "webrtc/pc/srtpfilter.h"
18 #include "webrtc/rtc_base/bind.h"
19 #include "webrtc/rtc_base/checks.h"
20 #include "webrtc/rtc_base/logging.h"
21 #include "webrtc/rtc_base/stringencode.h"
22 #include "webrtc/rtc_base/stringutils.h"
23 #include "webrtc/rtc_base/trace_event.h"
24 24
25 namespace cricket { 25 namespace cricket {
26 26
27 27
28 using rtc::Bind; 28 using rtc::Bind;
29 29
30 ChannelManager::ChannelManager(std::unique_ptr<MediaEngineInterface> me, 30 ChannelManager::ChannelManager(std::unique_ptr<MediaEngineInterface> me,
31 std::unique_ptr<DataEngineInterface> dme, 31 std::unique_ptr<DataEngineInterface> dme,
32 rtc::Thread* thread) { 32 rtc::Thread* thread) {
33 Construct(std::move(me), std::move(dme), thread, thread); 33 Construct(std::move(me), std::move(dme), thread, thread);
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 media_engine_.get(), file, max_size_bytes)); 449 media_engine_.get(), file, max_size_bytes));
450 } 450 }
451 451
452 void ChannelManager::StopAecDump() { 452 void ChannelManager::StopAecDump() {
453 worker_thread_->Invoke<void>( 453 worker_thread_->Invoke<void>(
454 RTC_FROM_HERE, 454 RTC_FROM_HERE,
455 Bind(&MediaEngineInterface::StopAecDump, media_engine_.get())); 455 Bind(&MediaEngineInterface::StopAecDump, media_engine_.get()));
456 } 456 }
457 457
458 } // namespace cricket 458 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/channelmanager.h ('k') | webrtc/pc/channelmanager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698