Pass VideoRenderer interface to ConnectionToHost.

remoting/client/chromoting_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/chromoting_client.h"
 
 #include <utility>
 
 #include "remoting/base/capabilities.h"
 #include "remoting/client/audio_decode_scheduler.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/client_user_interface.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/ice_connection_to_host.h"
 #include "remoting/protocol/ice_transport.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/transport_context.h"
-#include "remoting/protocol/video_renderer.h"
 
 namespace remoting {
 
 ChromotingClient::ChromotingClient(ClientContext* client_context,
                                    ClientUserInterface* user_interface,
                                    protocol::VideoRenderer* video_renderer,
                                    scoped_ptr<AudioPlayer> audio_player)
     : user_interface_(user_interface),
       video_renderer_(video_renderer),
       connection_(new protocol::IceConnectionToHost()) {
@@ skipping 27 matching lines @@
     const std::string& host_jid,
     const std::string& capabilities) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!session_manager_);  // Start must be called more than once.
 
   host_jid_ = host_jid;
   local_capabilities_ = capabilities;
 
   connection_->set_client_stub(this);
   connection_->set_clipboard_stub(this);
-  connection_->set_video_stub(video_renderer_->GetVideoStub());
+  connection_->set_video_renderer(video_renderer_);
   connection_->set_audio_stub(audio_decode_scheduler_.get());
 
   session_manager_.reset(new protocol::JingleSessionManager(signal_strategy));
 
   if (!protocol_config_)
     protocol_config_ = protocol::CandidateSessionConfig::CreateDefault();
   if (!audio_decode_scheduler_)
     protocol_config_->DisableAudioChannel();
   session_manager_->set_protocol_config(std::move(protocol_config_));
 
@@ skipping 121 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   connection_->Connect(
       session_manager_->Connect(host_jid_, std::move(authenticator_)),
       transport_context_, this);
 }
 
 void ChromotingClient::OnAuthenticated() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Initialize the decoder.
-  video_renderer_->OnSessionConfig(connection_->config());
   if (connection_->config().is_audio_enabled())
     audio_decode_scheduler_->Initialize(connection_->config());
 }
 
 void ChromotingClient::OnChannelsConnected() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Negotiate capabilities with the host.
   VLOG(1) << "Client capabilities: " << local_capabilities_;
 
   protocol::Capabilities capabilities;
   capabilities.set_capabilities(local_capabilities_);
   connection_->host_stub()->SetCapabilities(capabilities);
 }
 
 }  // namespace remoting