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

Unified Diff: remoting/signaling/xmpp_login_handler.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/signaling/signal_strategy.h ('k') | remoting/signaling/xmpp_login_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/signaling/xmpp_login_handler.h
diff --git a/remoting/signaling/xmpp_login_handler.h b/remoting/signaling/xmpp_login_handler.h
index 33d87e6b70d88536250f9b1f471d16033e97539a..451498f9201ba7a3abb50952e546452d9c1defd4 100644
--- a/remoting/signaling/xmpp_login_handler.h
+++ b/remoting/signaling/xmpp_login_handler.h
@@ -5,10 +5,10 @@
#ifndef REMOTING_SIGNALING_XMPP_LOGIN_HANDLER_H_
#define REMOTING_SIGNALING_XMPP_LOGIN_HANDLER_H_
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "remoting/signaling/signal_strategy.h"
// Undefine SendMessage and ERROR defined in Windows headers.
@@ -40,7 +40,7 @@ class XmppLoginHandler {
virtual void SendMessage(const std::string& message) = 0;
virtual void StartTls() = 0;
virtual void OnHandshakeDone(const std::string& jid,
- scoped_ptr<XmppStreamParser> parser) = 0;
+ std::unique_ptr<XmppStreamParser> parser) = 0;
virtual void OnLoginHandlerError(SignalStrategy::Error error) = 0;
protected:
@@ -112,7 +112,7 @@ class XmppLoginHandler {
};
// Callbacks for XmppStreamParser.
- void OnStanza(scoped_ptr<buzz::XmlElement> stanza);
+ void OnStanza(std::unique_ptr<buzz::XmlElement> stanza);
void OnParserError();
// Starts authentication handshake in WAIT_STREAM_HEADER_AFTER_TLS state.
@@ -134,7 +134,7 @@ class XmppLoginHandler {
std::string jid_;
- scoped_ptr<XmppStreamParser> stream_parser_;
+ std::unique_ptr<XmppStreamParser> stream_parser_;
DISALLOW_COPY_AND_ASSIGN(XmppLoginHandler);
};
« no previous file with comments | « remoting/signaling/signal_strategy.h ('k') | remoting/signaling/xmpp_login_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698