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

Unified Diff: chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc

Issue 2255007: New libjingle integrated to chrome. (Closed)
Patch Set: - Created 10 years, 7 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
Index: chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc
diff --git a/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc b/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc
index da443522919f27d9ca8db7e05b4da02fc1fcfb9a..7fe2b17d932459cf954b927f0d0127a998981aeb 100644
--- a/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc
+++ b/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc
@@ -15,6 +15,7 @@
#include "talk/base/firewallsocketserver.h"
#include "talk/base/logging.h"
#include "talk/base/socketadapters.h"
+#include "talk/base/ssladapter.h"
#include "talk/base/thread.h"
#include "talk/xmpp/xmppengine.h"
@@ -33,7 +34,7 @@ XmppSocketAdapter::XmppSocketAdapter(const buzz::XmppClientSettings& xcs,
write_buffer_capacity_(0),
allow_unverified_certs_(allow_unverified_certs) {
proxy_.type = xcs.proxy();
- proxy_.address.SetIP(xcs.proxy_host(), false);
+ proxy_.address.SetIP(xcs.proxy_host());
proxy_.address.SetPort(xcs.proxy_port());
proxy_.username = xcs.proxy_user();
proxy_.password = xcs.proxy_pass();
« no previous file with comments | « chrome/common/net/notifier/communicator/ssl_socket_adapter.cc ('k') | chrome/common/net/notifier/listener/listen_task.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698