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

Unified Diff: remoting/host/client_session.h

Issue 11817048: Revert 175648 because it causes http://crbug.com/169126. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/client_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/client_session.h
===================================================================
--- remoting/host/client_session.h (revision 176125)
+++ remoting/host/client_session.h (working copy)
@@ -133,6 +133,10 @@
return connection_.get();
}
+ DesktopEnvironment* desktop_environment() const {
+ return desktop_environment_.get();
+ }
+
const std::string& client_jid() { return client_jid_; }
bool is_authenticated() { return auth_input_filter_.enabled(); }
@@ -177,8 +181,11 @@
std::string client_jid_;
- // Filter used as the final element in the input pipeline.
- protocol::InputFilter host_input_filter_;
+ // The host clipboard and input stubs to which this object delegates.
+ // These are the final elements in the clipboard & input pipelines, which
+ // appear in order below.
+ protocol::ClipboardStub* host_clipboard_stub_;
+ protocol::InputStub* host_input_stub_;
// Tracker used to release pressed keys and buttons when disconnecting.
protocol::InputEventTracker input_tracker_;
@@ -190,8 +197,7 @@
MouseClampingFilter mouse_clamping_filter_;
// Filter to used to stop clipboard items sent from the client being echoed
- // back to it. It is the final element in the clipboard (client -> host)
- // pipeline.
+ // back to it.
protocol::ClipboardEchoFilter clipboard_echo_filter_;
// Filters used to manage enabling & disabling of input & clipboard.
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/client_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698