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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session_manager.h
diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h
index 3ac19067bc950f111d38fc94e1da65fa86d40e21..6a1fe4fb23024c17bbaa45290d7f43954dcb6054 100644
--- a/remoting/protocol/jingle_session_manager.h
+++ b/remoting/protocol/jingle_session_manager.h
@@ -39,12 +39,13 @@ class JingleSessionManager : public SessionManager,
// SessionManager interface.
void AcceptIncoming(
const IncomingSessionCallback& incoming_session_callback) override;
- void set_protocol_config(scoped_ptr<CandidateSessionConfig> config) override;
- scoped_ptr<Session> Connect(
+ void set_protocol_config(
+ std::unique_ptr<CandidateSessionConfig> config) override;
+ std::unique_ptr<Session> Connect(
const std::string& host_jid,
- scoped_ptr<Authenticator> authenticator) override;
+ std::unique_ptr<Authenticator> authenticator) override;
void set_authenticator_factory(
- scoped_ptr<AuthenticatorFactory> authenticator_factory) override;
+ std::unique_ptr<AuthenticatorFactory> authenticator_factory) override;
private:
friend class JingleSession;
@@ -64,10 +65,10 @@ class JingleSessionManager : public SessionManager,
SignalStrategy* signal_strategy_ = nullptr;
IncomingSessionCallback incoming_session_callback_;
- scoped_ptr<CandidateSessionConfig> protocol_config_;
+ std::unique_ptr<CandidateSessionConfig> protocol_config_;
- scoped_ptr<AuthenticatorFactory> authenticator_factory_;
- scoped_ptr<IqSender> iq_sender_;
+ std::unique_ptr<AuthenticatorFactory> authenticator_factory_;
+ std::unique_ptr<IqSender> iq_sender_;
SessionsMap sessions_;
« 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