webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc - Issue 1413333002: system_wrappers: rename interface -> include

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/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

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, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc ('k') | webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

index 82480d2e65aa0c9189bdcef2d785c37d3bb9e665..2d2cf9dbb81cbaffc02b8dc6bdbe22ca8bf18293 100644

--- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

+++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

@@ -13,8 +13,8 @@

#include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h"

#include "webrtc/modules/audio_processing/include/audio_processing.h"

#include "webrtc/modules/utility/interface/audio_frame_operations.h"

-#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"

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

+#include "webrtc/system_wrappers/include/critical_section_wrapper.h"

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

namespace webrtc {

namespace {