jingle/notifier/communicator/connection_settings.cc - Issue 653203005: Roll WebRTC 7546:7549.

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: jingle/notifier/communicator/connection_settings.cc

Issue 653203005: Roll WebRTC 7546:7549. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: jingle/notifier/communicator/connection_settings.cc

diff --git a/jingle/notifier/communicator/connection_settings.cc b/jingle/notifier/communicator/connection_settings.cc

index 164bbbc688d1f71515affcb6c8c28158eb9a7041..12d78c272d87602e0359e18604c1e4a835e1e9b9 100644

--- a/jingle/notifier/communicator/connection_settings.cc

+++ b/jingle/notifier/communicator/connection_settings.cc

@@ -6,12 +6,11 @@

#include "base/logging.h"

+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"

// Ideally we shouldn't include anything from talk/p2p, but we need

// the definition of ProtocolType. Don't use any functions from

// port.h, since it won't link.

-#include "talk/p2p/base/port.h"

-#include "talk/xmpp/xmppclientsettings.h"

+#include "webrtc/p2p/base/port.h"

namespace notifier {