third_party/libjingle/overrides/initialize_module.cc - Issue 429253003: Webrtc deps roll.

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: third_party/libjingle/overrides/initialize_module.cc

Issue 429253003: Webrtc deps roll. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 6 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:

Index: third_party/libjingle/overrides/initialize_module.cc

===================================================================

--- third_party/libjingle/overrides/initialize_module.cc (revision 286889)

+++ third_party/libjingle/overrides/initialize_module.cc (working copy)

@@ -7,9 +7,9 @@

#include "base/files/file_path.h"

#include "base/logging.h"

#include "init_webrtc.h"

-#include "talk/base/basictypes.h"

#include "talk/media/webrtc/webrtcmediaengine.h"

-#include "third_party/libjingle/overrides/talk/base/logging.h"

+#include "webrtc/base/basictypes.h"

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

#if !defined(LIBPEERCONNECTION_IMPLEMENTATION) || defined(LIBPEERCONNECTION_LIB)

#error "Only compile the allocator proxy with the shared_library implementation"

@@ -81,7 +81,7 @@

*create_media_engine = &CreateWebRtcMediaEngine;

*destroy_media_engine = &DestroyWebRtcMediaEngine;

- *init_diagnostic_logging = &talk_base::InitDiagnosticLoggingDelegateFunction;

+ *init_diagnostic_logging = &rtc::InitDiagnosticLoggingDelegateFunction;

if (CommandLine::Init(0, NULL)) {

#if !defined(OS_WIN)