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

Unified Diff: remoting/host/client_session.h

Issue 9646013: Add the plumbing that will carry a clipboard item from a chromoting client to a host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync, and make InputStub inherit from ClipboardStub. Created 8 years, 9 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
Index: remoting/host/client_session.h
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
index 31ac0793dcf81b0cabad117c7bb91d8a37800aa5..110f41d7ac26e8d3fa0a604dd1db1f53ba385f0b 100644
--- a/remoting/host/client_session.h
+++ b/remoting/host/client_session.h
@@ -10,6 +10,7 @@
#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"
@@ -57,13 +58,18 @@ class ClientSession : public protocol::HostStub,
};
// 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 01:14:44 While the ClipboardStub is part of the InputStub,
simonmorris 2012/03/15 16:53:19 ClipboardStub is no longer part of InputStub. But
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;
@@ -130,6 +136,9 @@ class ClientSession : public protocol::HostStub,
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_;

Powered by Google App Engine
This is Rietveld 408576698