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

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

Issue 8537020: Send correct termination reason when session is terminated by the host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | remoting/protocol/jingle_messages.cc » ('j') | remoting/protocol/jingle_session.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 21 matching lines...) Expand all
32 SESSION_TERMINATE, 32 SESSION_TERMINATE,
33 TRANSPORT_INFO, 33 TRANSPORT_INFO,
34 }; 34 };
35 35
36 enum Reason { 36 enum Reason {
37 // Currently only termination reasons that can be sent by the host 37 // Currently only termination reasons that can be sent by the host
38 // are understood. All others are converted to UNKNOWN_REASON. 38 // are understood. All others are converted to UNKNOWN_REASON.
39 UNKNOWN_REASON, 39 UNKNOWN_REASON,
40 SUCCESS, 40 SUCCESS,
41 DECLINE, 41 DECLINE,
42 GENERAL_ERROR,
Wez 2011/11/11 23:10:09 How does a "general error" differ from an "unknown
Sergey Ulanov 2011/11/12 00:02:52 It's basically the same. Jingle defines it as "The
42 INCOMPATIBLE_PARAMETERS, 43 INCOMPATIBLE_PARAMETERS,
Wez 2011/11/11 23:10:09 These are all macro-style and don't have very cons
Sergey Ulanov 2011/11/12 00:02:52 That's required by style guide.
Wez 2011/11/15 02:30:05 Style guide allows both forms and prefers non-macr
Sergey Ulanov 2011/11/15 02:37:21 Chromium style guide (http://www.chromium.org/deve
43 }; 44 };
44 45
45 JingleMessage(); 46 JingleMessage();
46 JingleMessage(const std::string& to_value, 47 JingleMessage(const std::string& to_value,
47 ActionType action_value, 48 ActionType action_value,
48 const std::string& sid_value); 49 const std::string& sid_value);
49 ~JingleMessage(); 50 ~JingleMessage();
50 51
51 // Caller keeps ownership of |stanza|. 52 // Caller keeps ownership of |stanza|.
52 static bool IsJingleMessage(const buzz::XmlElement* stanza); 53 static bool IsJingleMessage(const buzz::XmlElement* stanza);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 97
97 ReplyType type; 98 ReplyType type;
98 ErrorType error_type; 99 ErrorType error_type;
99 std::string text; 100 std::string text;
100 }; 101 };
101 102
102 } // protocol 103 } // protocol
103 } // remoting 104 } // remoting
104 105
105 #endif // REMOTING_PROTOCOL_JINGLE_MESSAGES_H_ 106 #endif // REMOTING_PROTOCOL_JINGLE_MESSAGES_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/protocol/jingle_messages.cc » ('j') | remoting/protocol/jingle_session.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698