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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: jingle/notifier/communicator/connection_settings.h

Issue 450463002: Update webrtc&libjingle 6774:6825. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « jingle/notifier/base/xmpp_connection_unittest.cc ('k') | jingle/notifier/communicator/connection_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/notifier/communicator/connection_settings.h
===================================================================
--- jingle/notifier/communicator/connection_settings.h (revision 287594)
+++ jingle/notifier/communicator/connection_settings.h (working copy)
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "jingle/notifier/base/server_information.h"
-#include "talk/base/socketaddress.h"
+#include "webrtc/base/socketaddress.h"
namespace buzz {
class XmppClientSettings;
@@ -25,7 +25,7 @@
struct ConnectionSettings {
public:
- ConnectionSettings(const talk_base::SocketAddress& server,
+ ConnectionSettings(const rtc::SocketAddress& server,
SslTcpMode ssltcp_mode,
SslTcpSupport ssltcp_support);
ConnectionSettings();
@@ -38,7 +38,7 @@
// Fill in the connection-related fields of |client_settings|.
void FillXmppClientSettings(buzz::XmppClientSettings* client_settings) const;
- talk_base::SocketAddress server;
+ rtc::SocketAddress server;
SslTcpMode ssltcp_mode;
SslTcpSupport ssltcp_support;
};
« no previous file with comments | « jingle/notifier/base/xmpp_connection_unittest.cc ('k') | jingle/notifier/communicator/connection_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698