jingle/notifier/base/notifier_options_util.h - 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/base/notifier_options_util.h

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

Patch Set: Decreased the number of gyp changes in this patch since thats the only major change (the reset is j… 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/base/notifier_options_util.h

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

index 6ba24716a6cd37fdc97a6fbd73149c372d69e390..2d14429d71d36b94a2522664ff32957a94142f14 100644

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

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

@@ -11,7 +11,7 @@

#include <vector>

#include "jingle/notifier/base/server_information.h"

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

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

namespace notifier {