OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "remoting/jingle_glue/jingle_client.h" | 5 #include "remoting/jingle_glue/jingle_client.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "jingle/notifier/communicator/gaia_token_pre_xmpp_auth.h" | 10 #include "jingle/notifier/communicator/gaia_token_pre_xmpp_auth.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 break; | 107 break; |
108 default: | 108 default: |
109 NOTREACHED(); | 109 NOTREACHED(); |
110 break; | 110 break; |
111 } | 111 } |
112 } | 112 } |
113 | 113 |
114 buzz::PreXmppAuth* XmppSignalStrategy::CreatePreXmppAuth( | 114 buzz::PreXmppAuth* XmppSignalStrategy::CreatePreXmppAuth( |
115 const buzz::XmppClientSettings& settings) { | 115 const buzz::XmppClientSettings& settings) { |
116 buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY); | 116 buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY); |
117 return new notifier::GaiaTokenPreXmppAuth(jid.Str(), settings.auth_cookie(), | 117 return new notifier::GaiaTokenPreXmppAuth( |
118 settings.token_service()); | 118 jid.Str(), |
| 119 settings.auth_cookie(), |
| 120 settings.token_service(), |
| 121 notifier::GaiaTokenPreXmppAuth::kDefaultAuthMechanism); |
119 } | 122 } |
120 | 123 |
121 | 124 |
122 JavascriptSignalStrategy::JavascriptSignalStrategy(const std::string& your_jid) | 125 JavascriptSignalStrategy::JavascriptSignalStrategy(const std::string& your_jid) |
123 : your_jid_(your_jid) { | 126 : your_jid_(your_jid) { |
124 } | 127 } |
125 | 128 |
126 JavascriptSignalStrategy::~JavascriptSignalStrategy() { | 129 JavascriptSignalStrategy::~JavascriptSignalStrategy() { |
127 } | 130 } |
128 | 131 |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 << ", stun: " << stun_servers; | 355 << ", stun: " << stun_servers; |
353 port_allocator_->SetRelayToken(token); | 356 port_allocator_->SetRelayToken(token); |
354 port_allocator_->SetStunHosts(stun_hosts); | 357 port_allocator_->SetStunHosts(stun_hosts); |
355 port_allocator_->SetRelayHosts(relay_hosts); | 358 port_allocator_->SetRelayHosts(relay_hosts); |
356 } else { | 359 } else { |
357 LOG(INFO) << "Jingle info found but no port allocator."; | 360 LOG(INFO) << "Jingle info found but no port allocator."; |
358 } | 361 } |
359 } | 362 } |
360 | 363 |
361 } // namespace remoting | 364 } // namespace remoting |
OLD | NEW |