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

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

Issue 7477008: Remove explicit keyword from multi-argument constructors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | « remoting/client/plugin/chromoting_scriptable_object.h ('k') | sandbox/src/crosscall_params.h » ('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) 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"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "remoting/protocol/session_config.h" 12 #include "remoting/protocol/session_config.h"
13 #include "third_party/libjingle/source/talk/p2p/base/sessiondescription.h" 13 #include "third_party/libjingle/source/talk/p2p/base/sessiondescription.h"
14 14
15 namespace buzz { 15 namespace buzz {
16 class XmlElement; 16 class XmlElement;
17 } // namespace buzz 17 } // namespace buzz
18 18
19 namespace remoting { 19 namespace remoting {
20 namespace protocol { 20 namespace protocol {
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 explicit ContentDescription(const CandidateSessionConfig* config, 29 ContentDescription(const CandidateSessionConfig* config,
30 const std::string& auth_token, 30 const std::string& auth_token,
31 const std::string& master_key, 31 const std::string& master_key,
32 const std::string& certificate); 32 const std::string& certificate);
33 virtual ~ContentDescription(); 33 virtual ~ContentDescription();
34 34
35 const CandidateSessionConfig* config() const { 35 const CandidateSessionConfig* config() const {
36 return candidate_config_.get(); 36 return candidate_config_.get();
37 } 37 }
38 38
39 const std::string& auth_token() const { return auth_token_; } 39 const std::string& auth_token() const { return auth_token_; }
40 const std::string& master_key() const { return master_key_; } 40 const std::string& master_key() const { return master_key_; }
41 const std::string& certificate() const { return certificate_; } 41 const std::string& certificate() const { return certificate_; }
42 42
(...skipping 11 matching lines...) Expand all
54 // Master key used for the session encrypted with the hosts key. 54 // Master key used for the session encrypted with the hosts key.
55 std::string master_key_; 55 std::string master_key_;
56 56
57 std::string certificate_; 57 std::string certificate_;
58 }; 58 };
59 59
60 } // namespace protocol 60 } // namespace protocol
61 } // namespace remoting 61 } // namespace remoting
62 62
63 #endif // REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_ 63 #endif // REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_
OLDNEW
« no previous file with comments | « remoting/client/plugin/chromoting_scriptable_object.h ('k') | sandbox/src/crosscall_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698