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

Side by Side Diff: remoting/protocol/libjingle_transport_factory.h

Issue 570463002: Revert of Move PseudoTCP and channel auth out of LibjingleTransportFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clean_dgrams
Patch Set: Created 6 years, 3 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
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 #ifndef REMOTING_PROTOCOL_LIBJINGLE_TRANSPORT_FACTORY_H_ 5 #ifndef REMOTING_PROTOCOL_LIBJINGLE_TRANSPORT_FACTORY_H_
6 #define REMOTING_PROTOCOL_LIBJINGLE_TRANSPORT_FACTORY_H_ 6 #define REMOTING_PROTOCOL_LIBJINGLE_TRANSPORT_FACTORY_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
(...skipping 29 matching lines...) Expand all
40 // is possible to configure |port_allocator| with STUN/Relay addresses. 40 // is possible to configure |port_allocator| with STUN/Relay addresses.
41 LibjingleTransportFactory( 41 LibjingleTransportFactory(
42 SignalStrategy* signal_strategy, 42 SignalStrategy* signal_strategy,
43 scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator, 43 scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator,
44 const NetworkSettings& network_settings); 44 const NetworkSettings& network_settings);
45 45
46 virtual ~LibjingleTransportFactory(); 46 virtual ~LibjingleTransportFactory();
47 47
48 // TransportFactory interface. 48 // TransportFactory interface.
49 virtual void PrepareTokens() OVERRIDE; 49 virtual void PrepareTokens() OVERRIDE;
50 virtual scoped_ptr<Transport> CreateTransport() OVERRIDE; 50 virtual scoped_ptr<StreamTransport> CreateStreamTransport() OVERRIDE;
51 virtual scoped_ptr<DatagramTransport> CreateDatagramTransport() OVERRIDE;
51 52
52 private: 53 private:
53 void EnsureFreshJingleInfo(); 54 void EnsureFreshJingleInfo();
54 void OnJingleInfo(const std::string& relay_token, 55 void OnJingleInfo(const std::string& relay_token,
55 const std::vector<std::string>& relay_hosts, 56 const std::vector<std::string>& relay_hosts,
56 const std::vector<rtc::SocketAddress>& stun_hosts); 57 const std::vector<rtc::SocketAddress>& stun_hosts);
57 58
58 SignalStrategy* signal_strategy_; 59 SignalStrategy* signal_strategy_;
59 scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator_; 60 scoped_ptr<cricket::HttpPortAllocatorBase> port_allocator_;
60 NetworkSettings network_settings_; 61 NetworkSettings network_settings_;
61 62
62 base::TimeTicks last_jingle_info_update_time_; 63 base::TimeTicks last_jingle_info_update_time_;
63 scoped_ptr<JingleInfoRequest> jingle_info_request_; 64 scoped_ptr<JingleInfoRequest> jingle_info_request_;
64 65
65 // When there is an active |jingle_info_request_| stores list of callbacks to 66 // When there is an active |jingle_info_request_| stores list of callbacks to
66 // be called once the |jingle_info_request_| is finished. 67 // be called once the |jingle_info_request_| is finished.
67 std::list<base::Closure> on_jingle_info_callbacks_; 68 std::list<base::Closure> on_jingle_info_callbacks_;
68 69
69 DISALLOW_COPY_AND_ASSIGN(LibjingleTransportFactory); 70 DISALLOW_COPY_AND_ASSIGN(LibjingleTransportFactory);
70 }; 71 };
71 72
72 } // namespace protocol 73 } // namespace protocol
73 } // namespace remoting 74 } // namespace remoting
74 75
75 #endif // REMOTING_PROTOCOL_LIBJINGLE_TRANSPORT_FACTORY_H_ 76 #endif // REMOTING_PROTOCOL_LIBJINGLE_TRANSPORT_FACTORY_H_
OLDNEW
« no previous file with comments | « remoting/protocol/jingle_session_unittest.cc ('k') | remoting/protocol/libjingle_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698