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

Side by Side Diff: webrtc/logging/rtc_event_log/rtc_event_log.cc

Issue 2781343002: Replace use of system_wrappers/include/logging.h by base/logging.h. (Closed)
Patch Set: Rebased. Created 3 years, 8 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 | « no previous file | webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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/logging/rtc_event_log/rtc_event_log.h" 11 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
12 12
13 #include <limits> 13 #include <limits>
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/checks.h" 16 #include "webrtc/base/checks.h"
17 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
18 #include "webrtc/base/event.h" 18 #include "webrtc/base/event.h"
19 #include "webrtc/base/logging.h"
19 #include "webrtc/base/swap_queue.h" 20 #include "webrtc/base/swap_queue.h"
20 #include "webrtc/base/thread_checker.h" 21 #include "webrtc/base/thread_checker.h"
21 #include "webrtc/base/timeutils.h" 22 #include "webrtc/base/timeutils.h"
22 #include "webrtc/call/call.h" 23 #include "webrtc/call/call.h"
23 #include "webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h" 24 #include "webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h"
24 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 25 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
25 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 26 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
26 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" 27 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h"
27 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" 28 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
28 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" 29 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h"
29 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" 30 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
30 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" 31 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
31 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" 32 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
32 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" 33 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
33 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" 34 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
34 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" 35 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h"
35 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" 36 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
36 #include "webrtc/system_wrappers/include/file_wrapper.h" 37 #include "webrtc/system_wrappers/include/file_wrapper.h"
37 #include "webrtc/system_wrappers/include/logging.h"
38 38
39 #ifdef ENABLE_RTC_EVENT_LOG 39 #ifdef ENABLE_RTC_EVENT_LOG
40 // Files generated at build-time by the protobuf compiler. 40 // Files generated at build-time by the protobuf compiler.
41 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD 41 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
42 #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h" 42 #include "external/webrtc/webrtc/logging/rtc_event_log/rtc_event_log.pb.h"
43 #else 43 #else
44 #include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h" 44 #include "webrtc/logging/rtc_event_log/rtc_event_log.pb.h"
45 #endif 45 #endif
46 #endif 46 #endif
47 47
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 #else 609 #else
610 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl()); 610 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl());
611 #endif // ENABLE_RTC_EVENT_LOG 611 #endif // ENABLE_RTC_EVENT_LOG
612 } 612 }
613 613
614 std::unique_ptr<RtcEventLog> RtcEventLog::CreateNull() { 614 std::unique_ptr<RtcEventLog> RtcEventLog::CreateNull() {
615 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl()); 615 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl());
616 } 616 }
617 617
618 } // namespace webrtc 618 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698