Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

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: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « jingle/notifier/communicator/DEPS ('k') | jingle/notifier/communicator/login.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « jingle/notifier/communicator/DEPS ('k') | jingle/notifier/communicator/login.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698