diff options
Diffstat (limited to 'remoting/jingle_glue/jingle_client.cc')
| -rw-r--r-- | remoting/jingle_glue/jingle_client.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/jingle_glue/jingle_client.cc b/remoting/jingle_glue/jingle_client.cc index b3ea334..938664e 100644 --- a/remoting/jingle_glue/jingle_client.cc +++ b/remoting/jingle_glue/jingle_client.cc @@ -9,11 +9,11 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "remoting/jingle_glue/gaia_token_pre_xmpp_auth.h" +#include "jingle/notifier/communicator/gaia_token_pre_xmpp_auth.h" +#include "jingle/notifier/communicator/xmpp_socket_adapter.h" #include "remoting/jingle_glue/iq_request.h" #include "remoting/jingle_glue/jingle_thread.h" #include "remoting/jingle_glue/relay_port_allocator.h" -#include "remoting/jingle_glue/xmpp_socket_adapter.h" #include "third_party/libjingle/source/talk/base/asyncsocket.h" #include "third_party/libjingle/source/talk/base/ssladapter.h" #include "third_party/libjingle/source/talk/p2p/base/sessionmanager.h" @@ -125,7 +125,7 @@ void JingleClient::DoInitialize(const std::string& username, client_->SignalStateChange.connect( this, &JingleClient::OnConnectionStateChanged); - buzz::AsyncSocket* socket = new XmppSocketAdapter(settings, false); + buzz::AsyncSocket* socket = new notifier::XmppSocketAdapter(settings, false); client_->Connect(settings, "", socket, CreatePreXmppAuth(settings)); client_->Start(); @@ -229,8 +229,8 @@ void JingleClient::UpdateState(State new_state) { buzz::PreXmppAuth* JingleClient::CreatePreXmppAuth( const buzz::XmppClientSettings& settings) { buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY); - return new GaiaTokenPreXmppAuth(jid.Str(), settings.auth_cookie(), - settings.token_service()); + return new notifier::GaiaTokenPreXmppAuth(jid.Str(), settings.auth_cookie(), + settings.token_service()); } } // namespace remoting |