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.h | |
| 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.h')
| -rw-r--r-- | remoting/protocol/jingle_messages.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/remoting/protocol/jingle_messages.h b/remoting/protocol/jingle_messages.h index 3dcdd41..03e5063 100644 --- a/remoting/protocol/jingle_messages.h +++ b/remoting/protocol/jingle_messages.h @@ -52,13 +52,12 @@ struct JingleMessage { // Caller keeps ownership of |stanza|. static bool IsJingleMessage(const buzz::XmlElement* stanza); - static std::string GetActionName(ActionType action); // Caller keeps ownership of |stanza|. |error| is set to debug error // message when parsing fails. bool ParseXml(const buzz::XmlElement* stanza, std::string* error); - scoped_ptr<buzz::XmlElement> ToXml() const; + scoped_ptr<buzz::XmlElement> ToXml(); std::string from; std::string to; |