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

Unified Diff: remoting/jingle_glue/javascript_signal_strategy.h

Issue 9005034: Refactor SignalStrategy so that it can be reused for multiple connections. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 8 years, 12 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/jingle_glue/iq_sender_unittest.cc ('k') | remoting/jingle_glue/javascript_signal_strategy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/jingle_glue/javascript_signal_strategy.h
diff --git a/remoting/jingle_glue/javascript_signal_strategy.h b/remoting/jingle_glue/javascript_signal_strategy.h
index 923dd2766db91577c5c768e698e68796952d0358..69ae52d1fee6821f66c00770a6cb689752f7e11c 100644
--- a/remoting/jingle_glue/javascript_signal_strategy.h
+++ b/remoting/jingle_glue/javascript_signal_strategy.h
@@ -12,6 +12,7 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "base/observer_list.h"
#include "base/threading/non_thread_safe.h"
#include "remoting/jingle_glue/xmpp_proxy.h"
@@ -23,14 +24,16 @@ class JavascriptSignalStrategy : public SignalStrategy,
public XmppProxy::ResponseCallback,
public base::NonThreadSafe {
public:
- explicit JavascriptSignalStrategy(const std::string& your_jid);
+ explicit JavascriptSignalStrategy(const std::string& local_jid);
virtual ~JavascriptSignalStrategy();
void AttachXmppProxy(scoped_refptr<XmppProxy> xmpp_proxy);
// SignalStrategy interface.
- virtual void Init(StatusObserver* observer) OVERRIDE;
- virtual void Close() OVERRIDE;
+ virtual void Connect() OVERRIDE;
+ virtual void Disconnect() OVERRIDE;
+ virtual State GetState() const OVERRIDE;
+ virtual std::string GetLocalJid() const OVERRIDE;
virtual void AddListener(Listener* listener) OVERRIDE;
virtual void RemoveListener(Listener* listener) OVERRIDE;
virtual bool SendStanza(buzz::XmlElement* stanza) OVERRIDE;
@@ -40,10 +43,10 @@ class JavascriptSignalStrategy : public SignalStrategy,
virtual void OnIq(const std::string& stanza) OVERRIDE;
private:
- std::string your_jid_;
+ std::string local_jid_;
scoped_refptr<XmppProxy> xmpp_proxy_;
- std::vector<Listener*> listeners_;
+ ObserverList<Listener> listeners_;
int last_id_;
« no previous file with comments | « remoting/jingle_glue/iq_sender_unittest.cc ('k') | remoting/jingle_glue/javascript_signal_strategy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698