| Index: remoting/host/session_manager.cc
|
| diff --git a/remoting/host/session_manager.cc b/remoting/host/session_manager.cc
|
| index b9726a725844e76012c73524c8c9e467876ff09f..6741905e7f35d3ed0ef5f5194f21955a97c7f397 100644
|
| --- a/remoting/host/session_manager.cc
|
| +++ b/remoting/host/session_manager.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/stl_util-inl.h"
|
| #include "remoting/base/capture_data.h"
|
| #include "remoting/base/tracer.h"
|
| +#include "remoting/proto/video.pb.h"
|
| #include "remoting/protocol/connection_to_client.h"
|
| #include "remoting/protocol/message_decoder.h"
|
|
|
| @@ -253,15 +254,7 @@ void SessionManager::DoGetInitInfo(
|
|
|
| ScopedTracer tracer("init");
|
|
|
| - // Sends the init message to the connection.
|
| - network_loop_->PostTask(
|
| - FROM_HERE,
|
| - NewTracedMethod(this, &SessionManager::DoSendInit, connection,
|
| - capturer()->width(), capturer()->height()));
|
| -
|
| - // And then add the connection to the list so it can receive update stream.
|
| - // It is important we do so in such order or the connection will receive
|
| - // update stream before init message.
|
| + // Add the client to the list so it can receive update stream.
|
| network_loop_->PostTask(
|
| FROM_HERE,
|
| NewTracedMethod(this, &SessionManager::DoAddClient, connection));
|
| @@ -347,14 +340,6 @@ void SessionManager::DoSendVideoPacket(VideoPacket* packet) {
|
| TraceContext::tracer()->PrintString("DoSendUpdate done");
|
| }
|
|
|
| -void SessionManager::DoSendInit(scoped_refptr<ConnectionToClient> connection,
|
| - int width, int height) {
|
| - DCHECK_EQ(network_loop_, MessageLoop::current());
|
| -
|
| - // Sends the connection init information.
|
| - connection->SendInitClientMessage(width, height);
|
| -}
|
| -
|
| void SessionManager::DoAddClient(scoped_refptr<ConnectionToClient> connection) {
|
| DCHECK_EQ(network_loop_, MessageLoop::current());
|
|
|
|
|