Added JsonMessage to the control channel.

remoting/protocol/client_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/client_control_dispatcher.h"
 
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "net/socket/stream_socket.h"
@@ skipping 56 matching lines @@
   writer_.Write(SerializeAndFrameMessage(message), base::Closure());
 }
 
 void ClientControlDispatcher::RequestPairing(
     const PairingRequest& pairing_request) {
   ControlMessage message;
   message.mutable_pairing_request()->CopyFrom(pairing_request);
   writer_.Write(SerializeAndFrameMessage(message), base::Closure());
 }
 
+void ClientControlDispatcher::DeliverClientMessage(
+    const ExtensionMessage& message) {
+  ControlMessage control_message;
+  control_message.mutable_extension_message()->CopyFrom(message);
+  writer_.Write(SerializeAndFrameMessage(control_message), base::Closure());
+}
+
 void ClientControlDispatcher::OnMessageReceived(
     scoped_ptr<ControlMessage> message, const base::Closure& done_task) {
   DCHECK(client_stub_);
   DCHECK(clipboard_stub_);
   base::ScopedClosureRunner done_runner(done_task);
 
   if (message->has_clipboard_event()) {
     clipboard_stub_->InjectClipboardEvent(message->clipboard_event());
   } else if (message->has_capabilities()) {
     client_stub_->SetCapabilities(message->capabilities());
   } else if (message->has_cursor_shape()) {
     client_stub_->SetCursorShape(message->cursor_shape());
   } else if (message->has_pairing_response()) {
     client_stub_->SetPairingResponse(message->pairing_response());
+  } else if (message->has_extension_message()) {
+    client_stub_->DeliverHostMessage(message->extension_message());
   } else {
     LOG(WARNING) << "Unknown control message received.";
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting