| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "jingle/notifier/communicator/single_login_attempt.h" | 7 #include "jingle/notifier/communicator/single_login_attempt.h" |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 DVLOG(1) << "Trying to connect to " << connection_settings.ToString(); | 150 DVLOG(1) << "Trying to connect to " << connection_settings.ToString(); |
| 151 // Copy the user settings and fill in the connection parameters from | 151 // Copy the user settings and fill in the connection parameters from |
| 152 // |connection_settings|. | 152 // |connection_settings|. |
| 153 buzz::XmppClientSettings client_settings = login_settings_.user_settings(); | 153 buzz::XmppClientSettings client_settings = login_settings_.user_settings(); |
| 154 connection_settings.FillXmppClientSettings(&client_settings); | 154 connection_settings.FillXmppClientSettings(&client_settings); |
| 155 | 155 |
| 156 buzz::Jid jid(client_settings.user(), client_settings.host(), | 156 buzz::Jid jid(client_settings.user(), client_settings.host(), |
| 157 buzz::STR_EMPTY); | 157 buzz::STR_EMPTY); |
| 158 buzz::PreXmppAuth* pre_xmpp_auth = | 158 buzz::PreXmppAuth* pre_xmpp_auth = |
| 159 new GaiaTokenPreXmppAuth( | 159 new GaiaTokenPreXmppAuth( |
| 160 jid.Str(), client_settings.auth_cookie(), | 160 jid.Str(), client_settings.auth_token(), |
| 161 client_settings.token_service(), | 161 client_settings.token_service(), |
| 162 login_settings_.auth_mechanism()); | 162 login_settings_.auth_mechanism()); |
| 163 xmpp_connection_.reset( | 163 xmpp_connection_.reset( |
| 164 new XmppConnection(client_settings, | 164 new XmppConnection(client_settings, |
| 165 login_settings_.request_context_getter(), | 165 login_settings_.request_context_getter(), |
| 166 this, | 166 this, |
| 167 pre_xmpp_auth)); | 167 pre_xmpp_auth)); |
| 168 } | 168 } |
| 169 | 169 |
| 170 } // namespace notifier | 170 } // namespace notifier |
| OLD | NEW |