Index: remoting/jingle_glue/jingle_client.h |
diff --git a/remoting/jingle_glue/jingle_client.h b/remoting/jingle_glue/jingle_client.h |
index aa94a001bd8a98bcbe2837f0e0f0a5382e8de05c..a943c161a43ec7dee636cebe53808c31b7a90a56 100644 |
--- a/remoting/jingle_glue/jingle_client.h |
+++ b/remoting/jingle_glue/jingle_client.h |
@@ -30,11 +30,14 @@ class Session; |
namespace remoting { |
+class IqRequest; |
+ |
class JingleClient : public base::RefCountedThreadSafe<JingleClient>, |
public sigslot::has_slots<> { |
public: |
enum State { |
- START, // Initial state. |
+ CREATED, // Initial state. |
+ START, |
awong
2010/08/02 19:53:49
We're getting too many states with different tense
Sergey Ulanov
2010/08/03 02:10:39
Done.
|
CONNECTING, |
CONNECTED, |
CLOSED, |
@@ -88,6 +91,10 @@ class JingleClient : public base::RefCountedThreadSafe<JingleClient>, |
// known yet, i.e. authentication hasn't finished. |
std::string GetFullJid(); |
+ // Creates new IqRequest for this client. Ownership for of the created object |
+ // is transfered to the caller. |
+ virtual IqRequest* CreateIqRequest(); |
+ |
// Current state of the client. |
State state() { return state_; } |
@@ -98,6 +105,8 @@ class JingleClient : public base::RefCountedThreadSafe<JingleClient>, |
MessageLoop* message_loop(); |
private: |
+ FRIEND_TEST_ALL_PREFIXES(HeartbeatSenderTest, DoSendStanza); |
+ |
void OnConnectionStateChanged(buzz::XmppEngine::State state); |
void OnIncomingTunnel(cricket::TunnelSessionClient* client, buzz::Jid jid, |