diff options
author | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 20:18:47 +0000 |
---|---|---|
committer | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 20:18:47 +0000 |
commit | 3ff2be6ac4070532a7a77eac3cdb5d51aa9f675e (patch) | |
tree | c14fd5efda900c0814b730d35e0a1c3f025760f2 /remoting/host/desktop_environment.h | |
parent | faa876c586096d73af30506e14b39cf24e78f05f (diff) | |
download | chromium_src-3ff2be6ac4070532a7a77eac3cdb5d51aa9f675e.zip chromium_src-3ff2be6ac4070532a7a77eac3cdb5d51aa9f675e.tar.gz chromium_src-3ff2be6ac4070532a7a77eac3cdb5d51aa9f675e.tar.bz2 |
Revert 88878 - Block remote mouse inputs for a short time when local input is received.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7134048
TBR=jamiewalch@google.com
Review URL: http://codereview.chromium.org/7134099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/desktop_environment.h')
-rw-r--r-- | remoting/host/desktop_environment.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h index 4182645..1ca119b 100644 --- a/remoting/host/desktop_environment.h +++ b/remoting/host/desktop_environment.h @@ -12,25 +12,20 @@ namespace remoting { class Capturer; class Curtain; -class DisconnectWindow; class EventExecutor; -class LocalInputMonitor; +class DisconnectWindow; class DesktopEnvironment { public: // DesktopEnvironment takes ownership of all the objects passed the ctor. DesktopEnvironment(Capturer* capturer, EventExecutor* event_executor, - Curtain* curtain, DisconnectWindow* disconnect_window, - LocalInputMonitor* monitor); + Curtain* curtain, DisconnectWindow* disconnect_window); virtual ~DesktopEnvironment(); Capturer* capturer() const { return capturer_.get(); } EventExecutor* event_executor() const { return event_executor_.get(); } Curtain* curtain() const { return curtain_.get(); } DisconnectWindow* disconnect_window() { return disconnect_window_.get(); } - LocalInputMonitor* local_input_monitor() { - return local_input_monitor_.get(); - } private: // Capturer to be used by ScreenRecorder. @@ -45,10 +40,6 @@ class DesktopEnvironment { // Provide a user interface allowing the host user to close the connection. scoped_ptr<DisconnectWindow> disconnect_window_; - // Monitor local inputs to allow remote inputs to be blocked while the local - // user is trying to do something. - scoped_ptr<LocalInputMonitor> local_input_monitor_; - DISALLOW_COPY_AND_ASSIGN(DesktopEnvironment); }; |