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

Unified Diff: remoting/client/chromoting_client.cc

Issue 565263006: Remove legacy version of the control channel protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | remoting/host/client_session.cc » ('j') | remoting/protocol/session_config.cc » ('J')
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 590902abcdccefc63e55b46a8f1e60e5f00dd2bd..2270796eeac02231257dc0fc8fdec280483f33a4 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -151,27 +151,17 @@ void ChromotingClient::OnAuthenticated() {
if (connection_.config().is_audio_enabled())
audio_decode_scheduler_->Initialize(connection_.config());
- // Do not negotiate capabilities with the host if the host does not support
- // them.
- if (!connection_.config().SupportsCapabilities()) {
- VLOG(1) << "The host does not support any capabilities.";
-
- host_capabilities_received_ = true;
- user_interface_->SetCapabilities(host_capabilities_);
- }
}
void ChromotingClient::OnChannelsConnected() {
DCHECK(task_runner_->BelongsToCurrentThread());
// Negotiate capabilities with the host.
- if (connection_.config().SupportsCapabilities()) {
- VLOG(1) << "Client capabilities: " << local_capabilities_;
+ VLOG(1) << "Client capabilities: " << local_capabilities_;
- protocol::Capabilities capabilities;
- capabilities.set_capabilities(local_capabilities_);
- connection_.host_stub()->SetCapabilities(capabilities);
- }
+ protocol::Capabilities capabilities;
+ capabilities.set_capabilities(local_capabilities_);
+ connection_.host_stub()->SetCapabilities(capabilities);
}
} // namespace remoting
« no previous file with comments | « no previous file | remoting/host/client_session.cc » ('j') | remoting/protocol/session_config.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698