Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Side by Side Diff: remoting/protocol/jingle_messages.h

Issue 16975019: Remove XML FROM element in JingleSession::StartConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reinvented fix to repair broken unit tests Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | remoting/protocol/jingle_messages.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_PROTOCOL_JINGLE_MESSAGES_H_ 5 #ifndef REMOTING_PROTOCOL_JINGLE_MESSAGES_H_
6 #define REMOTING_PROTOCOL_JINGLE_MESSAGES_H_ 6 #define REMOTING_PROTOCOL_JINGLE_MESSAGES_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 // message when parsing fails. 64 // message when parsing fails.
65 bool ParseXml(const buzz::XmlElement* stanza, std::string* error); 65 bool ParseXml(const buzz::XmlElement* stanza, std::string* error);
66 66
67 scoped_ptr<buzz::XmlElement> ToXml() const; 67 scoped_ptr<buzz::XmlElement> ToXml() const;
68 68
69 std::string from; 69 std::string from;
70 std::string to; 70 std::string to;
71 ActionType action; 71 ActionType action;
72 std::string sid; 72 std::string sid;
73 73
74 std::string initiator;
75
74 scoped_ptr<ContentDescription> description; 76 scoped_ptr<ContentDescription> description;
75 std::list<NamedCandidate> candidates; 77 std::list<NamedCandidate> candidates;
76 78
77 // Content of session-info messages. 79 // Content of session-info messages.
78 scoped_ptr<buzz::XmlElement> info; 80 scoped_ptr<buzz::XmlElement> info;
79 81
80 // Value from the <reason> tag if it is present in the 82 // Value from the <reason> tag if it is present in the
81 // message. Useful mainly for session-terminate messages, but Jingle 83 // message. Useful mainly for session-terminate messages, but Jingle
82 // spec allows it in any message. 84 // spec allows it in any message.
83 Reason reason; 85 Reason reason;
(...skipping 26 matching lines...) Expand all
110 112
111 ReplyType type; 113 ReplyType type;
112 ErrorType error_type; 114 ErrorType error_type;
113 std::string text; 115 std::string text;
114 }; 116 };
115 117
116 } // protocol 118 } // protocol
117 } // remoting 119 } // remoting
118 120
119 #endif // REMOTING_PROTOCOL_JINGLE_MESSAGES_H_ 121 #endif // REMOTING_PROTOCOL_JINGLE_MESSAGES_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/protocol/jingle_messages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698