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

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

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 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/connection_unittest.cc ('k') | 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 <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "remoting/protocol/session_config.h" 12 #include "remoting/protocol/session_config.h"
13 13
14 namespace buzz { 14 namespace buzz {
15 class XmlElement; 15 class XmlElement;
16 } // namespace buzz 16 } // namespace buzz
17 17
18 namespace remoting { 18 namespace remoting {
19 namespace protocol { 19 namespace protocol {
20 20
21 // ContentDescription used for chromoting sessions. It contains the information 21 // ContentDescription used for chromoting sessions. It contains the information
22 // from the content description stanza in the session initialization handshake. 22 // from the content description stanza in the session initialization handshake.
23 // 23 //
24 // This class also provides a type abstraction so that the Chromotocol Session 24 // This class also provides a type abstraction so that the Chromotocol Session
25 // interface does not need to depend on libjingle. 25 // interface does not need to depend on libjingle.
26 class ContentDescription { 26 class ContentDescription {
27 public: 27 public:
28 static const char kChromotingContentName[]; 28 static const char kChromotingContentName[];
29 29
30 ContentDescription(scoped_ptr<CandidateSessionConfig> config, 30 ContentDescription(std::unique_ptr<CandidateSessionConfig> config,
31 scoped_ptr<buzz::XmlElement> authenticator_message); 31 std::unique_ptr<buzz::XmlElement> authenticator_message);
32 ~ContentDescription(); 32 ~ContentDescription();
33 33
34 const CandidateSessionConfig* config() const { 34 const CandidateSessionConfig* config() const {
35 return candidate_config_.get(); 35 return candidate_config_.get();
36 } 36 }
37 37
38 const buzz::XmlElement* authenticator_message() const { 38 const buzz::XmlElement* authenticator_message() const {
39 return authenticator_message_.get(); 39 return authenticator_message_.get();
40 } 40 }
41 41
42 buzz::XmlElement* ToXml() const; 42 buzz::XmlElement* ToXml() const;
43 43
44 static scoped_ptr<ContentDescription> ParseXml( 44 static std::unique_ptr<ContentDescription> ParseXml(
45 const buzz::XmlElement* element, 45 const buzz::XmlElement* element,
46 bool webrtc_transport); 46 bool webrtc_transport);
47 47
48 private: 48 private:
49 scoped_ptr<const CandidateSessionConfig> candidate_config_; 49 std::unique_ptr<const CandidateSessionConfig> candidate_config_;
50 scoped_ptr<const buzz::XmlElement> authenticator_message_; 50 std::unique_ptr<const buzz::XmlElement> authenticator_message_;
51 51
52 static bool ParseChannelConfigs(const buzz::XmlElement* const element, 52 static bool ParseChannelConfigs(const buzz::XmlElement* const element,
53 const char tag_name[], 53 const char tag_name[],
54 bool codec_required, 54 bool codec_required,
55 bool optional, 55 bool optional,
56 std::list<ChannelConfig>* const configs); 56 std::list<ChannelConfig>* const configs);
57 }; 57 };
58 58
59 } // namespace protocol 59 } // namespace protocol
60 } // namespace remoting 60 } // namespace remoting
61 61
62 #endif // REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_ 62 #endif // REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_
OLDNEW
« no previous file with comments | « remoting/protocol/connection_unittest.cc ('k') | remoting/protocol/content_description.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698