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

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

Issue 10831022: Skip unknown channel configurations when parsing session config. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | remoting/protocol/content_description.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_CONTENT_DESCRIPTION_H_ 5 #ifndef REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_
6 #define REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_ 6 #define REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 26 matching lines...) Expand all
37 const CandidateSessionConfig* config() const { 37 const CandidateSessionConfig* config() const {
38 return candidate_config_.get(); 38 return candidate_config_.get();
39 } 39 }
40 40
41 const buzz::XmlElement* authenticator_message() const { 41 const buzz::XmlElement* authenticator_message() const {
42 return authenticator_message_.get(); 42 return authenticator_message_.get();
43 } 43 }
44 44
45 buzz::XmlElement* ToXml() const; 45 buzz::XmlElement* ToXml() const;
46 46
47 static ContentDescription* ParseXml(const buzz::XmlElement* element); 47 static scoped_ptr<ContentDescription> ParseXml(
48 const buzz::XmlElement* element);
48 49
49 private: 50 private:
50 scoped_ptr<const CandidateSessionConfig> candidate_config_; 51 scoped_ptr<const CandidateSessionConfig> candidate_config_;
51 scoped_ptr<const buzz::XmlElement> authenticator_message_; 52 scoped_ptr<const buzz::XmlElement> authenticator_message_;
52 53
53 static bool ParseChannelConfigs(const buzz::XmlElement* const element, 54 static bool ParseChannelConfigs(const buzz::XmlElement* const element,
54 const char tag_name[], 55 const char tag_name[],
55 bool codec_required, 56 bool codec_required,
56 bool optional, 57 bool optional,
57 std::vector<ChannelConfig>* const configs); 58 std::vector<ChannelConfig>* const configs);
58 }; 59 };
59 60
60 } // namespace protocol 61 } // namespace protocol
61 } // namespace remoting 62 } // namespace remoting
62 63
63 #endif // REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_ 64 #endif // REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/protocol/content_description.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698