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

Unified Diff: remoting/client/chromoting_client.cc

Issue 2542343004: Updating the Chromoting Test Driver to target the test environment (Closed)
Patch Set: Addressing feedback Created 4 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 | « no previous file | remoting/test/access_token_fetcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/chromoting_client.cc
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index e2da6ae73579f93e1cc61bb59cdae8683cd8a8c0..1e5c2ca49043aec49f5bff2f24813d0ddab5393a 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -65,10 +65,9 @@ void ChromotingClient::Start(
host_jid_ = NormalizeJid(host_jid);
local_capabilities_ = capabilities;
- if (!protocol_config_)
+ if (!protocol_config_) {
protocol_config_ = protocol::CandidateSessionConfig::CreateDefault();
- if (!audio_consumer_)
- protocol_config_->DisableAudioChannel();
+ }
if (!connection_) {
if (protocol_config_->webrtc_supported()) {
@@ -87,7 +86,11 @@ void ChromotingClient::Start(
connection_->set_clipboard_stub(this);
connection_->set_video_renderer(video_renderer_);
- connection_->InitializeAudio(audio_decode_task_runner_, audio_consumer_);
+ if (audio_consumer_) {
+ connection_->InitializeAudio(audio_decode_task_runner_, audio_consumer_);
+ } else {
+ protocol_config_->DisableAudioChannel();
+ }
session_manager_.reset(new protocol::JingleSessionManager(signal_strategy));
session_manager_->set_protocol_config(std::move(protocol_config_));
« no previous file with comments | « no previous file | remoting/test/access_token_fetcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698