webrtc/voice_engine/transmit_mixer.cc - Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/voice_engine/transmit_mixer.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, 6 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:

Index: webrtc/voice_engine/transmit_mixer.cc

diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc

index 6796f8457c5e5b3060920c6be9995b8f739612b2..ab0b6c782a549f0fbf57280ed2b5e3c5eb837c7d 100644

--- a/webrtc/voice_engine/transmit_mixer.cc

+++ b/webrtc/voice_engine/transmit_mixer.cc

@@ -13,9 +13,9 @@

#include <memory>

#include "webrtc/audio/utility/audio_frame_operations.h"

-#include "webrtc/base/format_macros.h"

-#include "webrtc/base/location.h"

-#include "webrtc/base/logging.h"

+#include "webrtc/rtc_base/format_macros.h"

+#include "webrtc/rtc_base/location.h"

+#include "webrtc/rtc_base/logging.h"

#include "webrtc/system_wrappers/include/event_wrapper.h"

#include "webrtc/system_wrappers/include/trace.h"

#include "webrtc/voice_engine/channel.h"