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

Unified Diff: remoting/host/desktop_environment.h

Issue 8725016: Refactor IT2Me-specific functions into a HostObserver subclass. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix indentation nits. Created 9 years, 1 month 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/desktop_environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_environment.h
diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
index 28da047e1f227931e2598eb3284cd55ca3763aaf..f95089bd90a971a40cf97433c5cabdb658da541a 100644
--- a/remoting/host/desktop_environment.h
+++ b/remoting/host/desktop_environment.h
@@ -18,11 +18,7 @@ namespace remoting {
class Capturer;
class ChromotingHost;
class ChromotingHostContext;
-class ContinueWindow;
-class Curtain;
-class DisconnectWindow;
class EventExecutor;
-class LocalInputMonitor;
class DesktopEnvironment {
public:
@@ -31,58 +27,15 @@ class DesktopEnvironment {
// DesktopEnvironment takes ownership of all the objects passed in.
DesktopEnvironment(ChromotingHostContext* context,
Capturer* capturer,
- EventExecutor* event_executor,
- Curtain* curtain,
- DisconnectWindow* disconnect_window,
- ContinueWindow* continue_window,
- LocalInputMonitor* monitor);
+ EventExecutor* event_executor);
virtual ~DesktopEnvironment();
- // Shuts down the object and all its resources synchronously. Must
- // be called on the UI thread.
- void Shutdown();
-
void set_host(ChromotingHost* host) { host_ = host; }
Capturer* capturer() const { return capturer_.get(); }
EventExecutor* event_executor() const { return event_executor_.get(); }
- Curtain* curtain() const { return curtain_.get(); }
-
- // Called whenever a new client has connected.
- void OnConnect(const std::string& username);
-
- // Called when the last client has disconnected.
- void OnLastDisconnect();
-
- // Called when the remote connection has been paused/unpaused.
- void OnPause(bool pause);
private:
- class TimerTask;
-
- void ProcessOnConnect(const std::string& username);
- void ProcessOnLastDisconnect();
-
- void MonitorLocalInputs(bool enable);
-
- // Show or hide the Disconnect window on the UI thread. If |show| is false,
- // hide the window, ignoring the |username| parameter.
- void ShowDisconnectWindow(bool show, const std::string& username);
-
- // Show or hide the Continue Sharing window on the UI thread.
- void ShowContinueWindow(bool show);
-
- // Called by the ContinueWindow implementation (on the UI thread) when the
- // user dismisses the Continue prompt.
- // TODO(lambroslambrou): Move this method to the (to be written)
- // It2MeObserver class.
- void ContinueSession(bool continue_session);
-
- void StartContinueWindowTimer(bool start);
-
- void OnContinueWindowTimer();
- void OnShutdownHostTimer();
-
// The host that owns this DesktopEnvironment.
ChromotingHost* host_;
@@ -96,27 +49,6 @@ class DesktopEnvironment {
// Executes input events received from the client.
scoped_ptr<EventExecutor> event_executor_;
- // Curtain ensures privacy for the remote user.
- scoped_ptr<Curtain> curtain_;
-
- // Provide a user interface allowing the host user to close the connection.
- scoped_ptr<DisconnectWindow> disconnect_window_;
-
- // Provide a user interface requiring the user to periodically re-confirm
- // the connection.
- scoped_ptr<ContinueWindow> continue_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_;
-
- bool is_monitoring_local_inputs_;
-
- // Timer controlling the "continue session" dialog.
- scoped_ptr<TimerTask> timer_task_;
-
- ScopedThreadProxy ui_thread_proxy_;
-
DISALLOW_COPY_AND_ASSIGN(DesktopEnvironment);
};
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698