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

Unified Diff: remoting/protocol/webrtc_connection_to_client.h

Issue 1510343002: Add WebrtcConnectionToClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@webrtc_thread
Patch Set: Created 5 years 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/video_stream.h ('k') | remoting/protocol/webrtc_connection_to_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/webrtc_connection_to_client.h
diff --git a/remoting/protocol/ice_connection_to_client.h b/remoting/protocol/webrtc_connection_to_client.h
similarity index 61%
copy from remoting/protocol/ice_connection_to_client.h
copy to remoting/protocol/webrtc_connection_to_client.h
index 8387b94ecb743146e056faa7eea4fa7b6ec68141..02919db619dadf48cfda449483a99422bc7d819e 100644
--- a/remoting/protocol/ice_connection_to_client.h
+++ b/remoting/protocol/webrtc_connection_to_client.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef REMOTING_PROTOCOL_ICE_CONNECTION_TO_CLIENT_H_
-#define REMOTING_PROTOCOL_ICE_CONNECTION_TO_CLIENT_H_
+#ifndef REMOTING_PROTOCOL_WEBRTC_CONNECTION_TO_CLIENT_H_
+#define REMOTING_PROTOCOL_WEBRTC_CONNECTION_TO_CLIENT_H_
#include <string>
@@ -17,24 +17,15 @@
namespace remoting {
namespace protocol {
-class AudioWriter;
class HostControlDispatcher;
class HostEventDispatcher;
-class HostVideoDispatcher;
-class VideoFeedbackStub;
-class VideoFramePump;
-
-// This class represents a remote viewer connection to the chromoting
-// host. It sets up all protocol channels and connects them to the
-// stubs.
-class IceConnectionToClient : public ConnectionToClient,
- public Session::EventHandler,
- public ChannelDispatcherBase::EventHandler {
+
+class WebrtcConnectionToClient : public ConnectionToClient,
+ public Session::EventHandler,
+ public ChannelDispatcherBase::EventHandler {
public:
- IceConnectionToClient(
- scoped_ptr<Session> session,
- scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner);
- ~IceConnectionToClient() override;
+ explicit WebrtcConnectionToClient(scoped_ptr<Session> session);
+ ~WebrtcConnectionToClient() override;
// ConnectionToClient interface.
void SetEventHandler(
@@ -61,32 +52,20 @@ class IceConnectionToClient : public ConnectionToClient,
ErrorCode error) override;
private:
- void NotifyIfChannelsReady();
-
- void Close(ErrorCode error);
-
- // Stops writing in the channels.
- void CloseChannels();
-
base::ThreadChecker thread_checker_;
// Event handler for handling events sent from this object.
- ConnectionToClient::EventHandler* event_handler_;
+ ConnectionToClient::EventHandler* event_handler_ = nullptr;
- // The libjingle channel used to send and receive data from the remote client.
scoped_ptr<Session> session_;
- scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner_;
-
scoped_ptr<HostControlDispatcher> control_dispatcher_;
scoped_ptr<HostEventDispatcher> event_dispatcher_;
- scoped_ptr<HostVideoDispatcher> video_dispatcher_;
- scoped_ptr<AudioWriter> audio_writer_;
- DISALLOW_COPY_AND_ASSIGN(IceConnectionToClient);
+ DISALLOW_COPY_AND_ASSIGN(WebrtcConnectionToClient);
};
} // namespace protocol
} // namespace remoting
-#endif // REMOTING_PROTOCOL_ICE_CONNECTION_TO_CLIENT_H_
+#endif // REMOTING_PROTOCOL_WEBRTC_CONNECTION_TO_CLIENT_H_
« no previous file with comments | « remoting/protocol/video_stream.h ('k') | remoting/protocol/webrtc_connection_to_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698