Protocol-level changes required to support PIN-less authentication.

remoting/protocol/host_control_dispatcher.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/protocol/host_control_dispatcher.h"
 
 #include "base/message_loop_proxy.h"
 #include "net/socket/stream_socket.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
 
 HostControlDispatcher::HostControlDispatcher()
     : ChannelDispatcherBase(kControlChannelName),
       clipboard_stub_(NULL),
-      host_stub_(NULL) {
+      host_stub_(NULL),
+      weak_factory_(this) {
 }
 
 HostControlDispatcher::~HostControlDispatcher() {
   writer_.Close();
 }
 
 void HostControlDispatcher::OnInitialized() {
   reader_.Init(channel(), base::Bind(
       &HostControlDispatcher::OnMessageReceived, base::Unretained(this)));
   writer_.Init(channel(), BufferedSocketWriter::WriteFailedCallback());
@@ skipping 29 matching lines @@
   if (message->has_clipboard_event()) {
     clipboard_stub_->InjectClipboardEvent(message->clipboard_event());
   } else if (message->has_client_resolution()) {
     host_stub_->NotifyClientResolution(message->client_resolution());
   } else if (message->has_video_control()) {
     host_stub_->ControlVideo(message->video_control());
   } else if (message->has_audio_control()) {
     host_stub_->ControlAudio(message->audio_control());
   } else if (message->has_capabilities()) {
     host_stub_->SetCapabilities(message->capabilities());
+  } else if (message->has_pairing_request()) {
+    host_stub_->RequestPairing(
+        message->pairing_request(),
+        base::Bind(&HostControlDispatcher::OnPairingReply,

[rmsousa, 2013/05/09 03:55:02]

If you don't use a bound callback you can remove the weakfactory as well.

[Jamie, 2013/05/09 17:59:52]

Done.

+                   weak_factory_.GetWeakPtr()));
   } else {
     LOG(WARNING) << "Unknown control message received.";
   }
 }
 
+void HostControlDispatcher::OnPairingReply(const PairingReply& pairing_reply) {

[rmsousa, 2013/05/09 03:55:02]

nit: Make this a verb (RespondToPairing?), move it up, with the other
marshallers.

[Jamie, 2013/05/09 17:59:52]

Done.

+  ControlMessage message;
+  message.mutable_pairing_reply()->CopyFrom(pairing_reply);
+  writer_.Write(SerializeAndFrameMessage(message), base::Closure());
+}
+
 }  // namespace protocol
 }  // namespace remoting