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

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

Issue 1545743002: Move ownership of Transport out of Session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_not_pass_client
Patch Set: Created 4 years, 12 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_JINGLE_SESSION_MANAGER_H_ 5 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
6 #define REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ 6 #define REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 14 matching lines...) Expand all
25 class JingleSession; 25 class JingleSession;
26 class TransportFactory; 26 class TransportFactory;
27 27
28 // JingleSessionManager and JingleSession implement the subset of the 28 // JingleSessionManager and JingleSession implement the subset of the
29 // Jingle protocol used in Chromoting. JingleSessionManager provides 29 // Jingle protocol used in Chromoting. JingleSessionManager provides
30 // the protocol::SessionManager interface for accepting incoming and 30 // the protocol::SessionManager interface for accepting incoming and
31 // creating outgoing sessions. 31 // creating outgoing sessions.
32 class JingleSessionManager : public SessionManager, 32 class JingleSessionManager : public SessionManager,
33 public SignalStrategy::Listener { 33 public SignalStrategy::Listener {
34 public: 34 public:
35 JingleSessionManager(scoped_ptr<TransportFactory> transport_factory, 35 explicit JingleSessionManager(SignalStrategy* signal_strategy);
36 SignalStrategy* signal_strategy);
37 ~JingleSessionManager() override; 36 ~JingleSessionManager() override;
38 37
39 // SessionManager interface. 38 // SessionManager interface.
40 void AcceptIncoming( 39 void AcceptIncoming(
41 const IncomingSessionCallback& incoming_session_callback) override; 40 const IncomingSessionCallback& incoming_session_callback) override;
42 void set_protocol_config(scoped_ptr<CandidateSessionConfig> config) override; 41 void set_protocol_config(scoped_ptr<CandidateSessionConfig> config) override;
43 scoped_ptr<Session> Connect( 42 scoped_ptr<Session> Connect(
44 const std::string& host_jid, 43 const std::string& host_jid,
45 scoped_ptr<Authenticator> authenticator) override; 44 scoped_ptr<Authenticator> authenticator) override;
46 void set_authenticator_factory( 45 void set_authenticator_factory(
47 scoped_ptr<AuthenticatorFactory> authenticator_factory) override; 46 scoped_ptr<AuthenticatorFactory> authenticator_factory) override;
48 47
49 private: 48 private:
50 friend class JingleSession; 49 friend class JingleSession;
51 50
52 // SignalStrategy::Listener interface. 51 // SignalStrategy::Listener interface.
53 void OnSignalStrategyStateChange(SignalStrategy::State state) override; 52 void OnSignalStrategyStateChange(SignalStrategy::State state) override;
54 bool OnSignalStrategyIncomingStanza(const buzz::XmlElement* stanza) override; 53 bool OnSignalStrategyIncomingStanza(const buzz::XmlElement* stanza) override;
55 54
56 typedef std::map<std::string, JingleSession*> SessionsMap; 55 typedef std::map<std::string, JingleSession*> SessionsMap;
57 56
58 IqSender* iq_sender() { return iq_sender_.get(); } 57 IqSender* iq_sender() { return iq_sender_.get(); }
59 void SendReply(const buzz::XmlElement* original_stanza, 58 void SendReply(const buzz::XmlElement* original_stanza,
60 JingleMessageReply::ErrorType error); 59 JingleMessageReply::ErrorType error);
61 60
62 // Called by JingleSession when it is being destroyed. 61 // Called by JingleSession when it is being destroyed.
63 void SessionDestroyed(JingleSession* session); 62 void SessionDestroyed(JingleSession* session);
64 63
65 scoped_ptr<TransportFactory> transport_factory_; 64 SignalStrategy* signal_strategy_ = nullptr;
66 SignalStrategy* signal_strategy_;
67 IncomingSessionCallback incoming_session_callback_; 65 IncomingSessionCallback incoming_session_callback_;
68 scoped_ptr<CandidateSessionConfig> protocol_config_; 66 scoped_ptr<CandidateSessionConfig> protocol_config_;
69 67
70 scoped_ptr<AuthenticatorFactory> authenticator_factory_; 68 scoped_ptr<AuthenticatorFactory> authenticator_factory_;
71 scoped_ptr<IqSender> iq_sender_; 69 scoped_ptr<IqSender> iq_sender_;
72 70
73 SessionsMap sessions_; 71 SessionsMap sessions_;
74 72
75 DISALLOW_COPY_AND_ASSIGN(JingleSessionManager); 73 DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
76 }; 74 };
77 75
78 } // namespace protocol 76 } // namespace protocol
79 } // namespace remoting 77 } // namespace remoting
80 78
81 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ 79 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698