diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 03:03:07 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 03:03:07 +0000 |
commit | ae671ec0bed00353c498fc5b096d3b1c18a8bd23 (patch) | |
tree | 15b5914f2e51d9b4c95fe513d302f12dc0567730 /remoting/jingle_glue/xmpp_signal_strategy.h | |
parent | 4f2c9c3f70ac0779bc6b42216ff2411541cc7763 (diff) | |
download | chromium_src-ae671ec0bed00353c498fc5b096d3b1c18a8bd23.zip chromium_src-ae671ec0bed00353c498fc5b096d3b1c18a8bd23.tar.gz chromium_src-ae671ec0bed00353c498fc5b096d3b1c18a8bd23.tar.bz2 |
Merge IqRequest implementations.
Removed XmppIqRequest and renamed JavascriptIqRequest to IqRequest.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8345031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue/xmpp_signal_strategy.h')
-rw-r--r-- | remoting/jingle_glue/xmpp_signal_strategy.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/remoting/jingle_glue/xmpp_signal_strategy.h b/remoting/jingle_glue/xmpp_signal_strategy.h index 9deb5f0..41f6461 100644 --- a/remoting/jingle_glue/xmpp_signal_strategy.h +++ b/remoting/jingle_glue/xmpp_signal_strategy.h @@ -13,6 +13,7 @@ #include "remoting/jingle_glue/signal_strategy.h" #include "base/compiler_specific.h" +#include "remoting/jingle_glue/iq_request.h" #include "third_party/libjingle/source/talk/base/sigslot.h" #include "third_party/libjingle/source/talk/xmpp/xmppclient.h" @@ -48,13 +49,15 @@ class XmppSignalStrategy : public SignalStrategy, JingleThread* thread_; - Listener* listener_; - std::string username_; std::string auth_token_; std::string auth_token_service_; buzz::XmppClient* xmpp_client_; + IqRegistry iq_registry_; + StatusObserver* observer_; + Listener* listener_; + DISALLOW_COPY_AND_ASSIGN(XmppSignalStrategy); }; |