diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 21:02:26 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 21:02:26 +0000 |
commit | 730bd1c0c25f2af8858a3e47c2c22f59bbd9efec (patch) | |
tree | 65f15ab9164e7eb75636b153c09642a56f9995ac /remoting/jingle_glue/javascript_signal_strategy.cc | |
parent | 2841c9057bd6fa9617d1ec44d46f2cc9a5b206f1 (diff) | |
download | chromium_src-730bd1c0c25f2af8858a3e47c2c22f59bbd9efec.zip chromium_src-730bd1c0c25f2af8858a3e47c2c22f59bbd9efec.tar.gz chromium_src-730bd1c0c25f2af8858a3e47c2c22f59bbd9efec.tar.bz2 |
Remove StartSession/EndSession from SignalStrategy interface.
BUG=None
TEST=remoting still works.
Review URL: http://codereview.chromium.org/7277017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue/javascript_signal_strategy.cc')
-rw-r--r-- | remoting/jingle_glue/javascript_signal_strategy.cc | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/remoting/jingle_glue/javascript_signal_strategy.cc b/remoting/jingle_glue/javascript_signal_strategy.cc index a754bb0..6dcceee 100644 --- a/remoting/jingle_glue/javascript_signal_strategy.cc +++ b/remoting/jingle_glue/javascript_signal_strategy.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "remoting/jingle_glue/iq_request.h" -#include "remoting/jingle_glue/jingle_signaling_connector.h" #include "remoting/jingle_glue/xmpp_proxy.h" #include "third_party/libjingle/source/talk/xmllite/xmlelement.h" @@ -20,7 +19,6 @@ JavascriptSignalStrategy::JavascriptSignalStrategy(const std::string& your_jid) } JavascriptSignalStrategy::~JavascriptSignalStrategy() { - jingle_signaling_connector_.reset(); DCHECK(listener_ == NULL); } @@ -44,6 +42,15 @@ void JavascriptSignalStrategy::Init(StatusObserver* observer) { observer->OnStateChange(StatusObserver::CONNECTED); } +void JavascriptSignalStrategy::Close() { + DCHECK(CalledOnValidThread()); + + if (xmpp_proxy_) { + xmpp_proxy_->DetachCallback(); + xmpp_proxy_ = NULL; + } +} + void JavascriptSignalStrategy::SetListener(Listener* listener) { DCHECK(CalledOnValidThread()); @@ -60,23 +67,6 @@ void JavascriptSignalStrategy::SendStanza(buzz::XmlElement* stanza) { delete stanza; } -void JavascriptSignalStrategy::StartSession( - cricket::SessionManager* session_manager) { - DCHECK(CalledOnValidThread()); - - jingle_signaling_connector_.reset( - new JingleSignalingConnector(this, session_manager)); -} - -void JavascriptSignalStrategy::EndSession() { - DCHECK(CalledOnValidThread()); - - if (xmpp_proxy_) { - xmpp_proxy_->DetachCallback(); - } - xmpp_proxy_ = NULL; -} - IqRequest* JavascriptSignalStrategy::CreateIqRequest() { DCHECK(CalledOnValidThread()); |