| 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 "jingle/notifier/communicator/connection_settings.h" | 5 #include "jingle/notifier/communicator/connection_settings.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 | 10 |
| 11 #include "webrtc/libjingle/xmpp/xmppclientsettings.h" | |
| 12 // Ideally we shouldn't include anything from talk/p2p, but we need | 11 // Ideally we shouldn't include anything from talk/p2p, but we need |
| 13 // the definition of ProtocolType. Don't use any functions from | 12 // the definition of ProtocolType. Don't use any functions from |
| 14 // port.h, since it won't link. | 13 // port.h, since it won't link. |
| 14 #include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h" |
| 15 #include "webrtc/p2p/base/port.h" | 15 #include "webrtc/p2p/base/port.h" |
| 16 | 16 |
| 17 namespace notifier { | 17 namespace notifier { |
| 18 | 18 |
| 19 const uint16_t kSslTcpPort = 443; | 19 const uint16_t kSslTcpPort = 443; |
| 20 | 20 |
| 21 ConnectionSettings::ConnectionSettings( | 21 ConnectionSettings::ConnectionSettings( |
| 22 const rtc::SocketAddress& server, | 22 const rtc::SocketAddress& server, |
| 23 SslTcpMode ssltcp_mode, | 23 SslTcpMode ssltcp_mode, |
| 24 SslTcpSupport ssltcp_support) | 24 SslTcpSupport ssltcp_support) |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 } | 94 } |
| 95 } else { | 95 } else { |
| 96 settings_list.push_back(settings); | 96 settings_list.push_back(settings); |
| 97 } | 97 } |
| 98 } | 98 } |
| 99 | 99 |
| 100 return settings_list; | 100 return settings_list; |
| 101 } | 101 } |
| 102 | 102 |
| 103 } // namespace notifier | 103 } // namespace notifier |
| OLD | NEW |