jingle/notifier/base/xmpp_connection.h - Issue 429113002: 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: jingle/notifier/base/xmpp_connection.h

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 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/base/xmpp_connection.h

diff --git a/jingle/notifier/base/xmpp_connection.h b/jingle/notifier/base/xmpp_connection.h

index b783764a4d16889b00fee96d0cb7e7105806d9d9..52102345d3fbbc81c0a0b1e917efaf89b0a58a31 100644

--- a/jingle/notifier/base/xmpp_connection.h

+++ b/jingle/notifier/base/xmpp_connection.h

@@ -14,8 +14,8 @@

#include "base/memory/weak_ptr.h"

#include "base/threading/non_thread_safe.h"

#include "net/url_request/url_request_context_getter.h"

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

#include "talk/xmpp/xmppengine.h"

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

namespace buzz {

class PreXmppAuth;