Chromium Code Reviews

Unified Diff: remoting/protocol/content_description.h

Issue 1085703003: Use standard ICE in Chromoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix crash on memory bots Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« 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 748b0f93fb3ae6445ebdf2c47ad5424b1d380fa1..f12582f9797f2942532ce601b8db69255492e856 100644
--- a/remoting/protocol/content_description.h
+++ b/remoting/protocol/content_description.h
@@ -10,7 +10,6 @@
#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;
@@ -24,15 +23,13 @@ namespace protocol {
//
// This class also provides a type abstraction so that the Chromotocol Session
// interface does not need to depend on libjingle.
-class ContentDescription : public cricket::ContentDescription {
+class ContentDescription {
public:
static const char kChromotingContentName[];
ContentDescription(scoped_ptr<CandidateSessionConfig> config,
scoped_ptr<buzz::XmlElement> authenticator_message);
- ~ContentDescription() override;
-
- ContentDescription* Copy() const override;
+ ~ContentDescription();
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