diff options
Diffstat (limited to 'remoting/signaling')
-rw-r--r-- | remoting/signaling/fake_signal_strategy.h | 20 | ||||
-rw-r--r-- | remoting/signaling/iq_sender.h | 8 | ||||
-rw-r--r-- | remoting/signaling/log_to_server.h | 8 | ||||
-rw-r--r-- | remoting/signaling/xmpp_signal_strategy.h | 22 |
4 files changed, 27 insertions, 31 deletions
diff --git a/remoting/signaling/fake_signal_strategy.h b/remoting/signaling/fake_signal_strategy.h index bd316ff..7a599dc 100644 --- a/remoting/signaling/fake_signal_strategy.h +++ b/remoting/signaling/fake_signal_strategy.h @@ -29,7 +29,7 @@ class FakeSignalStrategy : public SignalStrategy, static void Connect(FakeSignalStrategy* peer1, FakeSignalStrategy* peer2); FakeSignalStrategy(const std::string& jid); - virtual ~FakeSignalStrategy(); + ~FakeSignalStrategy() override; const std::list<buzz::XmlElement*>& received_messages() { return received_messages_; @@ -39,15 +39,15 @@ class FakeSignalStrategy : public SignalStrategy, void ConnectTo(FakeSignalStrategy* peer); // SignalStrategy interface. - virtual void Connect() override; - virtual void Disconnect() override; - virtual State GetState() const override; - virtual Error GetError() const override; - virtual std::string GetLocalJid() const override; - virtual void AddListener(Listener* listener) override; - virtual void RemoveListener(Listener* listener) override; - virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) override; - virtual std::string GetNextId() override; + void Connect() override; + void Disconnect() override; + State GetState() const override; + Error GetError() const override; + std::string GetLocalJid() const override; + void AddListener(Listener* listener) override; + void RemoveListener(Listener* listener) override; + bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) override; + std::string GetNextId() override; private: typedef base::Callback<void(scoped_ptr<buzz::XmlElement> message)> diff --git a/remoting/signaling/iq_sender.h b/remoting/signaling/iq_sender.h index 51879d4..02744ed 100644 --- a/remoting/signaling/iq_sender.h +++ b/remoting/signaling/iq_sender.h @@ -38,7 +38,7 @@ class IqSender : public SignalStrategy::Listener { const buzz::XmlElement* response)> ReplyCallback; explicit IqSender(SignalStrategy* signal_strategy); - virtual ~IqSender(); + ~IqSender() override; // Send an iq stanza. Returns an IqRequest object that represends // the request. |callback| is called when response to |stanza| is @@ -55,10 +55,8 @@ class IqSender : public SignalStrategy::Listener { const ReplyCallback& callback); // SignalStrategy::Listener implementation. - virtual void OnSignalStrategyStateChange( - SignalStrategy::State state) override; - virtual bool OnSignalStrategyIncomingStanza( - const buzz::XmlElement* stanza) override; + void OnSignalStrategyStateChange(SignalStrategy::State state) override; + bool OnSignalStrategyIncomingStanza(const buzz::XmlElement* stanza) override; private: typedef std::map<std::string, IqRequest*> IqRequestMap; diff --git a/remoting/signaling/log_to_server.h b/remoting/signaling/log_to_server.h index b1647925..fd03235 100644 --- a/remoting/signaling/log_to_server.h +++ b/remoting/signaling/log_to_server.h @@ -30,13 +30,11 @@ class LogToServer : public base::NonThreadSafe, LogToServer(ServerLogEntry::Mode mode, SignalStrategy* signal_strategy, const std::string& directory_bot_jid); - virtual ~LogToServer(); + ~LogToServer() override; // SignalStrategy::Listener interface. - virtual void OnSignalStrategyStateChange( - SignalStrategy::State state) override; - virtual bool OnSignalStrategyIncomingStanza( - const buzz::XmlElement* stanza) override; + void OnSignalStrategyStateChange(SignalStrategy::State state) override; + bool OnSignalStrategyIncomingStanza(const buzz::XmlElement* stanza) override; void Log(const ServerLogEntry& entry); diff --git a/remoting/signaling/xmpp_signal_strategy.h b/remoting/signaling/xmpp_signal_strategy.h index 05eb079..2f378bf 100644 --- a/remoting/signaling/xmpp_signal_strategy.h +++ b/remoting/signaling/xmpp_signal_strategy.h @@ -57,21 +57,21 @@ class XmppSignalStrategy : public base::NonThreadSafe, net::ClientSocketFactory* socket_factory, scoped_refptr<net::URLRequestContextGetter> request_context_getter, const XmppServerConfig& xmpp_server_config); - virtual ~XmppSignalStrategy(); + ~XmppSignalStrategy() override; // SignalStrategy interface. - virtual void Connect() override; - virtual void Disconnect() override; - virtual State GetState() const override; - virtual Error GetError() const override; - virtual std::string GetLocalJid() const override; - virtual void AddListener(Listener* listener) override; - virtual void RemoveListener(Listener* listener) override; - virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) override; - virtual std::string GetNextId() override; + void Connect() override; + void Disconnect() override; + State GetState() const override; + Error GetError() const override; + std::string GetLocalJid() const override; + void AddListener(Listener* listener) override; + void RemoveListener(Listener* listener) override; + bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) override; + std::string GetNextId() override; // buzz::XmppStanzaHandler interface. - virtual bool HandleStanza(const buzz::XmlElement* stanza) override; + bool HandleStanza(const buzz::XmlElement* stanza) override; // This method is used to update the auth info (for example when the OAuth // access token is renewed). It is OK to call this even when we are in the |