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

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

Issue 543433002: Roll WebRTC 7011:7046 libjingle: 7007:7045 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update README.chromium Created 6 years, 3 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 | « remoting/protocol/fake_authenticator.cc ('k') | 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
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "third_party/libjingle/source/talk/p2p/base/candidate.h" 12 #include "third_party/libjingle/source/talk/p2p/base/candidate.h"
13 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h" 13 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
14 14
15 15
16 namespace remoting { 16 namespace remoting {
17 namespace protocol { 17 namespace protocol {
18 18
19 class ContentDescription; 19 class ContentDescription;
20 20
21 extern const char kJabberNamespace[]; 21 extern const char kJabberNamespace[];
22 extern const char kJingleNamespace[]; 22 extern const char kJingleNamespace[];
23 extern const char kP2PTransportNamespace[]; 23 extern const char kP2PTransportNamespace[];
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 ReplyType type; 113 ReplyType type;
114 ErrorType error_type; 114 ErrorType error_type;
115 std::string text; 115 std::string text;
116 }; 116 };
117 117
118 } // protocol 118 } // protocol
119 } // remoting 119 } // remoting
120 120
121 #endif // REMOTING_PROTOCOL_JINGLE_MESSAGES_H_ 121 #endif // REMOTING_PROTOCOL_JINGLE_MESSAGES_H_
OLDNEW
« no previous file with comments | « remoting/protocol/fake_authenticator.cc ('k') | remoting/protocol/jingle_messages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698