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

Unified Diff: remoting/protocol/content_description.h

Issue 1099203005: Revert of Use standard ICE in Chromoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/session_manager_factory.cc ('k') | remoting/protocol/content_description.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/content_description.h
diff --git a/remoting/protocol/content_description.h b/remoting/protocol/content_description.h
index f12582f9797f2942532ce601b8db69255492e856..748b0f93fb3ae6445ebdf2c47ad5424b1d380fa1 100644
--- a/remoting/protocol/content_description.h
+++ b/remoting/protocol/content_description.h
@@ -10,6 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "remoting/protocol/session_config.h"
+#include "third_party/webrtc/p2p/base/sessiondescription.h"
namespace buzz {
class XmlElement;
@@ -23,13 +24,15 @@
//
// This class also provides a type abstraction so that the Chromotocol Session
// interface does not need to depend on libjingle.
-class ContentDescription {
+class ContentDescription : public cricket::ContentDescription {
public:
static const char kChromotingContentName[];
ContentDescription(scoped_ptr<CandidateSessionConfig> config,
scoped_ptr<buzz::XmlElement> authenticator_message);
- ~ContentDescription();
+ ~ContentDescription() override;
+
+ ContentDescription* Copy() const override;
const CandidateSessionConfig* config() const {
return candidate_config_.get();
« no previous file with comments | « remoting/host/session_manager_factory.cc ('k') | remoting/protocol/content_description.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698