Add the plumbing that will carry a clipboard item from a chromoting client to a host.

remoting/host/client_session.h

 // 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.
 
 #ifndef REMOTING_HOST_CLIENT_SESSION_H_
 #define REMOTING_HOST_CLIENT_SESSION_H_
 
 #include <list>
 #include <set>
 
 #include "base/time.h"
 #include "base/threading/non_thread_safe.h"
+#include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_stub.h"
 #include "third_party/skia/include/core/SkPoint.h"
 
 namespace remoting {
 
 class Capturer;
 
 // A ClientSession keeps a reference to a connection to a client, and maintains
 // per-client state.
-class ClientSession : public protocol::HostStub,
+class ClientSession : public protocol::ClipboardStub,

[Wez, 2012/03/15 20:37:19]

Implement HostEventStub rather than ClipboardStub and InputStub?

[simonmorris, 2012/03/15 21:49:31]

Done.

+                      public protocol::HostStub,
                       public protocol::InputStub,
                       public protocol::ConnectionToClient::EventHandler,
                       public base::NonThreadSafe {
  public:
   // Callback interface for passing events to the ChromotingHost.
   class EventHandler {
    public:
     virtual ~EventHandler() {}
 
     // Called after authentication has finished successfully.
@@ skipping 15 matching lines @@
     // Called on notification of a route change event, when a channel is
     // connected.
     virtual void OnSessionRouteChange(
         ClientSession* client,
         const std::string& channel_name,
         const net::IPEndPoint& remote_end_point,
         const net::IPEndPoint& local_end_point) = 0;
   };
 
   // Takes ownership of |connection|. Does not take ownership of
-  // |event_handler|, |input_stub| or |capturer|.
+  // |event_handler|, |clipboard_stub|, |input_stub| or |capturer|.
   ClientSession(EventHandler* event_handler,
                 protocol::ConnectionToClient* connection,
+                protocol::ClipboardStub* clipboard_stub,

[Wez, 2012/03/15 20:37:19]

Use HostEventStub here rather than separate InputStub and ClipboardStub?

[simonmorris, 2012/03/15 21:49:31]

Done.

                 protocol::InputStub* input_stub,
                 Capturer* capturer);
   virtual ~ClientSession();
 
+  // protocol::ClipboardStub interface.
+  virtual void InjectClipboardEvent(
+      const protocol::ClipboardEvent& event) OVERRIDE;
+
   // protocol::InputStub interface.
   virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
   virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
 
   // protocol::ConnectionToClient::EventHandler interface.
   virtual void OnConnectionOpened(
       protocol::ConnectionToClient* connection) OVERRIDE;
   virtual void OnConnectionClosed(
       protocol::ConnectionToClient* connection) OVERRIDE;
   virtual void OnConnectionFailed(protocol::ConnectionToClient* connection,
@@ skipping 46 matching lines @@
   // when the user disconnects.
   void RestoreEventState();
 
   EventHandler* event_handler_;
 
   // The connection to the client.
   scoped_ptr<protocol::ConnectionToClient> connection_;
 
   std::string client_jid_;
 
+  // The clipboard stub to which this object delegates.
+  protocol::ClipboardStub* clipboard_stub_;
+
   // The input stub to which this object delegates.
   protocol::InputStub* input_stub_;
 
   // Capturer, used to determine current screen size for ensuring injected
   // mouse events fall within the screen area.
   // TODO(lambroslambrou): Move floor-control logic, and clamping to screen
   // area, out of this class (crbug.com/96508).
   Capturer* capturer_;
 
   // Whether this client is authenticated.
@@ skipping 20 matching lines @@
   // Set of keys that are currently pressed down by the user. This is used so
   // we can release them if the user disconnects.
   std::set<int> pressed_keys_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSession);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CLIENT_SESSION_H_