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

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.cc

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

index fa48209ea699a5844288ff88bff8308ff2809cdf..9949d4efef0b91bdfc76b1ce93fa7d37fa854efb 100644

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

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

@@ -7,8 +7,8 @@

#include "base/logging.h"

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

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

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

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

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

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

namespace notifier {