Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: jingle/notifier/communicator/connection_settings.cc

Issue 2443903004: Add xmllite and xmpp sources to third_party/ (Closed)
Patch Set: Explicitly use webrtc_overrides/webrtc/base/logging.h Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « jingle/notifier/base/xmpp_connection_unittest.cc ('k') | jingle/notifier/communicator/login.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « jingle/notifier/base/xmpp_connection_unittest.cc ('k') | jingle/notifier/communicator/login.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698