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

Unified Diff: remoting/protocol/webrtc_connection_to_client.cc

Issue 2334293002: Two minor cleanups in remoting protocol. (Closed)
Patch Set: . Created 4 years, 3 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
Index: remoting/protocol/webrtc_connection_to_client.cc
diff --git a/remoting/protocol/webrtc_connection_to_client.cc b/remoting/protocol/webrtc_connection_to_client.cc
index bb7fa3cb74deed6172060cbb355e135ea6f6d07c..ced85548531852ff3f3e46cae5601c9a9ede9308 100644
--- a/remoting/protocol/webrtc_connection_to_client.cc
+++ b/remoting/protocol/webrtc_connection_to_client.cc
@@ -72,11 +72,6 @@ void WebrtcConnectionToClient::Disconnect(ErrorCode error) {
session_->Close(error);
}
-void WebrtcConnectionToClient::OnInputEventReceived(int64_t timestamp) {
- DCHECK(thread_checker_.CalledOnValidThread());
- event_handler_->OnInputEventReceived(this, timestamp);
-}
-
std::unique_ptr<VideoStream> WebrtcConnectionToClient::StartVideoStream(
std::unique_ptr<webrtc::DesktopCapturer> desktop_capturer) {
// TODO(isheriff): make this codec independent
@@ -178,8 +173,9 @@ void WebrtcConnectionToClient::OnWebrtcTransportIncomingDataChannel(
std::unique_ptr<MessagePipe> pipe) {
if (name == event_dispatcher_->channel_name() &&
!event_dispatcher_->is_connected()) {
- event_dispatcher_->set_on_input_event_callback(base::Bind(
- &ConnectionToClient::OnInputEventReceived, base::Unretained(this)));
+ event_dispatcher_->set_on_input_event_callback(
+ base::Bind(&WebrtcConnectionToClient::OnInputEventReceived,
+ base::Unretained(this)));
event_dispatcher_->Init(std::move(pipe), this);
}
}
@@ -211,5 +207,10 @@ void WebrtcConnectionToClient::OnChannelClosed(
Disconnect(INCOMPATIBLE_PROTOCOL);
}
+void WebrtcConnectionToClient::OnInputEventReceived(int64_t timestamp) {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ event_handler_->OnInputEventReceived(this, timestamp);
+}
+
} // namespace protocol
} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698