summaryrefslogtreecommitdiffstats
path: root/remoting/host/client_session.h
diff options
context:
space:
mode:
authorjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-20 19:32:45 +0000
committerjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-20 19:32:45 +0000
commit35c14eeb34ca5f21b70a388e868ff3968545812f (patch)
tree70d4fb062c1d406ac4f22bb0bd577fd5d503a04b /remoting/host/client_session.h
parent0b711e4718b64621ee2cdf5c5de597a53d1b2b07 (diff)
downloadchromium_src-35c14eeb34ca5f21b70a388e868ff3968545812f.zip
chromium_src-35c14eeb34ca5f21b70a388e868ff3968545812f.tar.gz
chromium_src-35c14eeb34ca5f21b70a388e868ff3968545812f.tar.bz2
Completed basic implementation.
BUG=None TEST=Manual Review URL: http://codereview.chromium.org/7200009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/client_session.h')
-rw-r--r--remoting/host/client_session.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
index e014bdc..17dbe9b 100644
--- a/remoting/host/client_session.h
+++ b/remoting/host/client_session.h
@@ -6,6 +6,7 @@
#define REMOTING_HOST_CLIENT_SESSION_H_
#include <list>
+#include <set>
#include "remoting/protocol/connection_to_client.h"
#include "remoting/protocol/host_stub.h"
@@ -68,12 +69,17 @@ class ClientSession : public protocol::HostStub,
return authenticated_;
}
+ void set_awaiting_continue_approval(bool awaiting) {
+ awaiting_continue_approval_ = awaiting;
+ }
+
// 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
// have the upper hand in 'pointer wars'.
void LocalMouseMoved(const gfx::Point& new_pos);
- bool ShouldIgnoreRemoteInput() const;
+ bool ShouldIgnoreRemoteMouseInput(const protocol::MouseEvent* event) const;
+ bool ShouldIgnoreRemoteKeyboardInput(const protocol::KeyEvent* event) const;
private:
friend class base::RefCountedThreadSafe<ClientSession>;
@@ -93,10 +99,15 @@ class ClientSession : public protocol::HostStub,
// Whether this client is authenticated.
bool authenticated_;
+ // Whether or not inputs from this client are blocked pending approval from
+ // the host user to continue the connection.
+ bool awaiting_continue_approval_;
+
// State to control remote input blocking while the local pointer is in use.
uint32 remote_mouse_button_state_;
std::list<gfx::Point> recent_remote_mouse_positions_;
base::Time latest_local_input_time_;
+ std::set<int> pressed_keys_;
DISALLOW_COPY_AND_ASSIGN(ClientSession);
};