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

Unified Diff: remoting/client/chromoting_client.cc

Issue 2798393007: Use SignalingAddress in SignalStrategy insterface. (Closed)
Patch Set: header Created 3 years, 8 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/client/plugin/chromoting_instance.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 8e8e77db8a763f3be370c4459c4aa1949e323ac5..802947708381afbbcaf4120ba78eed7fa60831a9 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -233,7 +233,7 @@ void ChromotingClient::OnSignalStrategyStateChange(
DCHECK(thread_checker_.CalledOnValidThread());
if (state == SignalStrategy::CONNECTED) {
- VLOG(1) << "Connected as: " << signal_strategy_->GetLocalJid();
+ VLOG(1) << "Connected as: " << signal_strategy_->GetLocalAddress().jid();
// After signaling has been connected we can try connecting to the host.
if (connection_ &&
connection_->state() == protocol::ConnectionToHost::INITIALIZING) {
@@ -255,9 +255,10 @@ bool ChromotingClient::OnSignalStrategyIncomingStanza(
void ChromotingClient::StartConnection() {
DCHECK(thread_checker_.CalledOnValidThread());
auto session = session_manager_->Connect(
- host_jid_, base::MakeUnique<protocol::NegotiatingClientAuthenticator>(
- NormalizeJid(signal_strategy_->GetLocalJid()), host_jid_,
- client_auth_config_));
+ SignalingAddress(host_jid_),
+ base::MakeUnique<protocol::NegotiatingClientAuthenticator>(
+ signal_strategy_->GetLocalAddress().id(), host_jid_,
+ client_auth_config_));
if (host_experiment_sender_) {
session->AddPlugin(host_experiment_sender_.get());
}
« no previous file with comments | « no previous file | remoting/client/plugin/chromoting_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698