summaryrefslogtreecommitdiffstats
path: root/remoting/client/chromoting_client.cc
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/client/chromoting_client.cc')
-rw-r--r--remoting/client/chromoting_client.cc16
1 files changed, 11 insertions, 5 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index 4411adf..013060c 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -55,13 +55,12 @@ void ChromotingClient::Start(
scoped_ptr<protocol::TransportFactory> transport_factory) {
DCHECK(task_runner_->BelongsToCurrentThread());
- // TODO(jamiewalch): Add the plumbing required to get the client id and
- // shared secret from the web-app.
- std::string client_id, shared_secret;
scoped_ptr<protocol::Authenticator> authenticator(
new protocol::NegotiatingClientAuthenticator(
- client_id, shared_secret,
- config_.authentication_tag, config_.fetch_secret_callback,
+ config_.client_pairing_id,
+ config_.client_paired_secret,
+ config_.authentication_tag,
+ config_.fetch_secret_callback,
user_interface_->GetTokenFetcher(config_.host_public_key),
config_.authentication_methods));
@@ -123,6 +122,13 @@ void ChromotingClient::SetCapabilities(
IntersectCapabilities(config_.capabilities, host_capabilities_));
}
+void ChromotingClient::SetPairingResponse(
+ const protocol::PairingResponse& pairing_response) {
+ DCHECK(task_runner_->BelongsToCurrentThread());
+
+ user_interface_->SetPairingResponse(pairing_response);
+}
+
void ChromotingClient::InjectClipboardEvent(
const protocol::ClipboardEvent& event) {
DCHECK(task_runner_->BelongsToCurrentThread());