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

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

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 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 | « remoting/protocol/jingle_session.cc ('k') | remoting/protocol/jingle_session_manager.cc » ('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 #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 21 matching lines...) Expand all
32 // creating outgoing sessions. 32 // creating outgoing sessions.
33 class JingleSessionManager : public SessionManager, 33 class JingleSessionManager : public SessionManager,
34 public SignalStrategy::Listener { 34 public SignalStrategy::Listener {
35 public: 35 public:
36 explicit JingleSessionManager(SignalStrategy* signal_strategy); 36 explicit JingleSessionManager(SignalStrategy* signal_strategy);
37 ~JingleSessionManager() override; 37 ~JingleSessionManager() override;
38 38
39 // SessionManager interface. 39 // SessionManager interface.
40 void AcceptIncoming( 40 void AcceptIncoming(
41 const IncomingSessionCallback& incoming_session_callback) override; 41 const IncomingSessionCallback& incoming_session_callback) override;
42 void set_protocol_config(scoped_ptr<CandidateSessionConfig> config) override; 42 void set_protocol_config(
43 scoped_ptr<Session> Connect( 43 std::unique_ptr<CandidateSessionConfig> config) override;
44 std::unique_ptr<Session> Connect(
44 const std::string& host_jid, 45 const std::string& host_jid,
45 scoped_ptr<Authenticator> authenticator) override; 46 std::unique_ptr<Authenticator> authenticator) override;
46 void set_authenticator_factory( 47 void set_authenticator_factory(
47 scoped_ptr<AuthenticatorFactory> authenticator_factory) override; 48 std::unique_ptr<AuthenticatorFactory> authenticator_factory) override;
48 49
49 private: 50 private:
50 friend class JingleSession; 51 friend class JingleSession;
51 52
52 // SignalStrategy::Listener interface. 53 // SignalStrategy::Listener interface.
53 void OnSignalStrategyStateChange(SignalStrategy::State state) override; 54 void OnSignalStrategyStateChange(SignalStrategy::State state) override;
54 bool OnSignalStrategyIncomingStanza(const buzz::XmlElement* stanza) override; 55 bool OnSignalStrategyIncomingStanza(const buzz::XmlElement* stanza) override;
55 56
56 typedef std::map<std::string, JingleSession*> SessionsMap; 57 typedef std::map<std::string, JingleSession*> SessionsMap;
57 58
58 IqSender* iq_sender() { return iq_sender_.get(); } 59 IqSender* iq_sender() { return iq_sender_.get(); }
59 void SendReply(const buzz::XmlElement* original_stanza, 60 void SendReply(const buzz::XmlElement* original_stanza,
60 JingleMessageReply::ErrorType error); 61 JingleMessageReply::ErrorType error);
61 62
62 // Called by JingleSession when it is being destroyed. 63 // Called by JingleSession when it is being destroyed.
63 void SessionDestroyed(JingleSession* session); 64 void SessionDestroyed(JingleSession* session);
64 65
65 SignalStrategy* signal_strategy_ = nullptr; 66 SignalStrategy* signal_strategy_ = nullptr;
66 IncomingSessionCallback incoming_session_callback_; 67 IncomingSessionCallback incoming_session_callback_;
67 scoped_ptr<CandidateSessionConfig> protocol_config_; 68 std::unique_ptr<CandidateSessionConfig> protocol_config_;
68 69
69 scoped_ptr<AuthenticatorFactory> authenticator_factory_; 70 std::unique_ptr<AuthenticatorFactory> authenticator_factory_;
70 scoped_ptr<IqSender> iq_sender_; 71 std::unique_ptr<IqSender> iq_sender_;
71 72
72 SessionsMap sessions_; 73 SessionsMap sessions_;
73 74
74 DISALLOW_COPY_AND_ASSIGN(JingleSessionManager); 75 DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
75 }; 76 };
76 77
77 } // namespace protocol 78 } // namespace protocol
78 } // namespace remoting 79 } // namespace remoting
79 80
80 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ 81 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
OLDNEW
« no previous file with comments | « remoting/protocol/jingle_session.cc ('k') | remoting/protocol/jingle_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698