diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 03:51:56 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 03:51:56 +0000 |
| commit | 740d451cf5222a5046d63029a88e58c7204c6ba2 (patch) | |
| tree | 43b3a71eb8c9d23e48f31434cc3c2ef2e85ef877 /remoting/protocol/jingle_messages.cc | |
| parent | 426199abc7929b84c80df803b828f3f9c47b4b6d (diff) | |
| download | chromium_src-740d451cf5222a5046d63029a88e58c7204c6ba2.zip chromium_src-740d451cf5222a5046d63029a88e58c7204c6ba2.tar.gz chromium_src-740d451cf5222a5046d63029a88e58c7204c6ba2.tar.bz2 | |
Revert 123635 - Implement timeouts for IQ requests.
Now the IqRequest class supports setting timeouts for each request, and
JingleSession uses it to disconnect if no response is receive within 10
secons from a request.
BUG=107925
Review URL: http://codereview.chromium.org/9452038
TBR=sergeyu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9447087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_messages.cc')
| -rw-r--r-- | remoting/protocol/jingle_messages.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/remoting/protocol/jingle_messages.cc b/remoting/protocol/jingle_messages.cc index a1b87ff..8fe749d 100644 --- a/remoting/protocol/jingle_messages.cc +++ b/remoting/protocol/jingle_messages.cc @@ -141,11 +141,6 @@ bool JingleMessage::IsJingleMessage(const buzz::XmlElement* stanza) { stanza->FirstNamed(QName(kJingleNamespace, "jingle")) != NULL; } -// static -std::string JingleMessage::GetActionName(ActionType action) { - return ValueToName(kActionTypes, arraysize(kActionTypes), action); -} - JingleMessage::JingleMessage() : action(UNKNOWN_ACTION), reason(UNKNOWN_REASON) { @@ -273,7 +268,7 @@ bool JingleMessage::ParseXml(const buzz::XmlElement* stanza, return true; } -scoped_ptr<buzz::XmlElement> JingleMessage::ToXml() const { +scoped_ptr<buzz::XmlElement> JingleMessage::ToXml() { scoped_ptr<XmlElement> root( new XmlElement(QName("jabber:client", "iq"), true)); |