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

Unified Diff: remoting/host/client_session.h

Issue 10860033: Allow input & clipboard filters to be disabled without NULLing target stub. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments and fix clipboard pipeline initialization. Created 8 years, 4 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 | « no previous file | 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
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
index 0dd65d4855ae57279622ea5d3f62011b8dab504b..d1de45c7897ec56249659b867d911366becebeec 100644
--- a/remoting/host/client_session.h
+++ b/remoting/host/client_session.h
@@ -110,7 +110,7 @@ class ClientSession : public protocol::HostStub,
const std::string& client_jid() { return client_jid_; }
- bool is_authenticated() { return is_authenticated_; }
+ bool is_authenticated() { return auth_input_filter_.enabled(); }
// Indicate that local mouse activity has been detected. This causes remote
// inputs to be ignored for a short time so that the local user will always
@@ -131,7 +131,6 @@ class ClientSession : public protocol::HostStub,
scoped_ptr<protocol::ConnectionToClient> connection_;
std::string client_jid_;
- bool is_authenticated_;
// The host clipboard and input stubs to which this object delegates.
// These are the final elements in the clipboard & input pipelines, which
@@ -148,6 +147,10 @@ class ClientSession : public protocol::HostStub,
// Filter used to clamp mouse events to the current display dimensions.
protocol::MouseInputFilter mouse_input_filter_;
+ // Filter to used to stop clipboard items sent from the client being echoed
+ // back to it.
+ protocol::ClipboardEchoFilter clipboard_echo_filter_;
+
// Filters used to manage enabling & disabling of input & clipboard.
protocol::InputFilter disable_input_filter_;
protocol::ClipboardFilter disable_clipboard_filter_;
@@ -156,10 +159,6 @@ class ClientSession : public protocol::HostStub,
protocol::InputFilter auth_input_filter_;
protocol::ClipboardFilter auth_clipboard_filter_;
- // Filter to used to stop clipboard items sent from the client being echoed
- // back to it.
- protocol::ClipboardEchoFilter clipboard_echo_filter_;
-
// Factory for weak pointers to the client clipboard stub.
// This must appear after |clipboard_echo_filter_|, so that it won't outlive
// it.
« no previous file with comments | « no previous file | remoting/host/client_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698