| Index: remoting/jingle_glue/xmpp_signal_strategy.h
|
| diff --git a/remoting/jingle_glue/xmpp_signal_strategy.h b/remoting/jingle_glue/xmpp_signal_strategy.h
|
| index ec405a466a3be249db430b7dea7320667d5592d6..790b0bddfb52444dce807f8595fdcd6d2d198728 100644
|
| --- a/remoting/jingle_glue/xmpp_signal_strategy.h
|
| +++ b/remoting/jingle_glue/xmpp_signal_strategy.h
|
| @@ -40,6 +40,7 @@ class XmppSignalStrategy : public base::NonThreadSafe,
|
| 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;
|
| @@ -78,8 +79,9 @@ class XmppSignalStrategy : public base::NonThreadSafe,
|
| buzz::XmppClient* xmpp_client_;
|
|
|
| State state_;
|
| + Error error_;
|
|
|
| - ObserverList<Listener> listeners_;
|
| + ObserverList<Listener, true> listeners_;
|
|
|
| base::RepeatingTimer<XmppSignalStrategy> keep_alive_timer_;
|
|
|
|
|