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

Unified Diff: remoting/protocol/pepper_session.h

Issue 8587053: Remove event_channel() and control_channel() from Session interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 1 month 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/protocol/jingle_session_unittest.cc ('k') | remoting/protocol/pepper_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/pepper_session.h
diff --git a/remoting/protocol/pepper_session.h b/remoting/protocol/pepper_session.h
index eaaaa6e6f40d66d8821c1e0b8df347e2882e49df..7e0668752018ff1a408e679c42a874b5ad33e277 100644
--- a/remoting/protocol/pepper_session.h
+++ b/remoting/protocol/pepper_session.h
@@ -49,8 +49,6 @@ class PepperSession : public Session {
const std::string& name,
const DatagramChannelCallback& callback) OVERRIDE;
virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
- virtual net::Socket* control_channel() OVERRIDE;
- virtual net::Socket* event_channel() OVERRIDE;
virtual const std::string& jid() OVERRIDE;
virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
virtual const SessionConfig& config() OVERRIDE;
@@ -104,12 +102,6 @@ class PepperSession : public Session {
void SendTransportInfo();
void OnTransportInfoResponse(const buzz::XmlElement* response);
- // Helper methods to create event and control channels.
- // TODO(sergeyu): Remove these methods.
- void CreateChannels();
- void OnChannelConnected(scoped_ptr<net::Socket>* socket_container,
- net::StreamSocket* socket);
-
// Close all the channels and terminate the session.
void CloseInternal(bool failed);
@@ -138,9 +130,6 @@ class PepperSession : public Session {
ChannelsMap channels_;
- scoped_ptr<net::Socket> control_channel_socket_;
- scoped_ptr<net::Socket> event_channel_socket_;
-
base::OneShotTimer<PepperSession> transport_infos_timer_;
std::list<cricket::Candidate> pending_candidates_;
« no previous file with comments | « remoting/protocol/jingle_session_unittest.cc ('k') | remoting/protocol/pepper_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698