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

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

Issue 9240033: Use scoped_ptr<>.Pass() to pass ownership in the remoting protocol code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 8 years, 11 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
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_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 10 matching lines...) Expand all
21 21
22 // ContentDescription used for chromoting sessions. It contains the information 22 // ContentDescription used for chromoting sessions. It contains the information
23 // from the content description stanza in the session intialization handshake. 23 // from the content description stanza in the session intialization handshake.
24 // 24 //
25 // This class also provides a type abstraction so that the Chromotocol Session 25 // This class also provides a type abstraction so that the Chromotocol Session
26 // interface does not need to depend on libjingle. 26 // interface does not need to depend on libjingle.
27 class ContentDescription : public cricket::ContentDescription { 27 class ContentDescription : public cricket::ContentDescription {
28 public: 28 public:
29 static const char kChromotingContentName[]; 29 static const char kChromotingContentName[];
30 30
31 // Takes ownership of |config| and |authenticator_message|. 31 ContentDescription(scoped_ptr<CandidateSessionConfig> config,
32 ContentDescription(const CandidateSessionConfig* config, 32 scoped_ptr<buzz::XmlElement> authenticator_message);
33 const buzz::XmlElement* authenticator_message);
34 virtual ~ContentDescription(); 33 virtual ~ContentDescription();
35 34
36 const CandidateSessionConfig* config() const { 35 const CandidateSessionConfig* config() const {
37 return candidate_config_.get(); 36 return candidate_config_.get();
38 } 37 }
39 38
40 const buzz::XmlElement* authenticator_message() const { 39 const buzz::XmlElement* authenticator_message() const {
41 return authenticator_message_.get(); 40 return authenticator_message_.get();
42 } 41 }
43 42
44 buzz::XmlElement* ToXml() const; 43 buzz::XmlElement* ToXml() const;
45 44
46 static ContentDescription* ParseXml(const buzz::XmlElement* element); 45 static ContentDescription* ParseXml(const buzz::XmlElement* element);
47 46
48 private: 47 private:
49 scoped_ptr<const CandidateSessionConfig> candidate_config_; 48 scoped_ptr<const CandidateSessionConfig> candidate_config_;
50 scoped_ptr<const buzz::XmlElement> authenticator_message_; 49 scoped_ptr<const buzz::XmlElement> authenticator_message_;
51 }; 50 };
52 51
53 } // namespace protocol 52 } // namespace protocol
54 } // namespace remoting 53 } // namespace remoting
55 54
56 #endif // REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_ 55 #endif // REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698