OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // TODO(ajwong): We assign and read from a few of the member variables on | 5 // TODO(ajwong): We assign and read from a few of the member variables on |
6 // two threads. We need to audit this for thread safety. | 6 // two threads. We need to audit this for thread safety. |
7 | 7 |
8 #include "remoting/jingle_glue/jingle_client.h" | 8 #include "remoting/jingle_glue/jingle_client.h" |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/waitable_event.h" | |
12 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
13 #include "remoting/jingle_glue/gaia_token_pre_xmpp_auth.h" | 12 #include "remoting/jingle_glue/gaia_token_pre_xmpp_auth.h" |
14 #include "remoting/jingle_glue/iq_request.h" | 13 #include "remoting/jingle_glue/iq_request.h" |
15 #include "remoting/jingle_glue/jingle_thread.h" | 14 #include "remoting/jingle_glue/jingle_thread.h" |
16 #include "remoting/jingle_glue/relay_port_allocator.h" | 15 #include "remoting/jingle_glue/relay_port_allocator.h" |
17 #include "remoting/jingle_glue/xmpp_socket_adapter.h" | 16 #include "remoting/jingle_glue/xmpp_socket_adapter.h" |
18 #include "third_party/libjingle/source/talk/base/asyncsocket.h" | 17 #include "third_party/libjingle/source/talk/base/asyncsocket.h" |
19 #include "third_party/libjingle/source/talk/base/ssladapter.h" | 18 #include "third_party/libjingle/source/talk/base/ssladapter.h" |
20 #include "third_party/libjingle/source/talk/p2p/base/sessionmanager.h" | 19 #include "third_party/libjingle/source/talk/p2p/base/sessionmanager.h" |
21 #include "third_party/libjingle/source/talk/p2p/client/sessionmanagertask.h" | 20 #include "third_party/libjingle/source/talk/p2p/client/sessionmanagertask.h" |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 } | 220 } |
222 | 221 |
223 buzz::PreXmppAuth* JingleClient::CreatePreXmppAuth( | 222 buzz::PreXmppAuth* JingleClient::CreatePreXmppAuth( |
224 const buzz::XmppClientSettings& settings) { | 223 const buzz::XmppClientSettings& settings) { |
225 buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY); | 224 buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY); |
226 return new GaiaTokenPreXmppAuth(jid.Str(), settings.auth_cookie(), | 225 return new GaiaTokenPreXmppAuth(jid.Str(), settings.auth_cookie(), |
227 settings.token_service()); | 226 settings.token_service()); |
228 } | 227 } |
229 | 228 |
230 } // namespace remoting | 229 } // namespace remoting |
OLD | NEW |