Index: remoting/host/basic_desktop_environment.h |
diff --git a/remoting/host/basic_desktop_environment.h b/remoting/host/basic_desktop_environment.h |
index 3f6b5e09a01b1207b0310ebccb1de44d36fae1aa..6202ba5f94791f78fad918fcc810b443a6959e26 100644 |
--- a/remoting/host/basic_desktop_environment.h |
+++ b/remoting/host/basic_desktop_environment.h |
@@ -10,14 +10,12 @@ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/ref_counted.h" |
+#include "base/memory/scoped_ptr.h" |
#include "remoting/host/desktop_environment.h" |
#include "remoting/host/ui_strings.h" |
namespace remoting { |
-class HostWindow; |
-class LocalInputMonitor; |
- |
// Used to create audio/video capturers and event executor that work with |
// the local console. |
class BasicDesktopEnvironment : public DesktopEnvironment { |
@@ -41,13 +39,8 @@ class BasicDesktopEnvironment : public DesktopEnvironment { |
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
- const UiStrings* ui_strings); |
- |
- // Initializes UI elements required for non-curtained session: |
- // DisconnectWindow and LocalInputMonitor. Must be called by the factory when |
- // the session is not curtained (i.e. shared with a local user). |
- void InitNonCurtainedSessionUI( |
- base::WeakPtr<ClientSessionControl> client_session_control); |
+ base::WeakPtr<ClientSessionControl> client_session_control, |
+ const UiStrings& ui_strings); |
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const { |
return caller_task_runner_; |
@@ -61,8 +54,6 @@ class BasicDesktopEnvironment : public DesktopEnvironment { |
return ui_task_runner_; |
} |
- const UiStrings* ui_strings() const { return ui_strings_; } |
- |
private: |
// Task runner on which methods of DesktopEnvironment interface should be |
// called. |
@@ -74,15 +65,6 @@ class BasicDesktopEnvironment : public DesktopEnvironment { |
// Used to run UI code. |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; |
- // Presents the disconnect window to the local user. |
- scoped_ptr<HostWindow> disconnect_window_; |
- |
- // Notifies the client session about the local mouse movements. |
- scoped_ptr<LocalInputMonitor> local_input_monitor_; |
- |
- // Points to the localized UI strings. |
- const UiStrings* ui_strings_; |
- |
DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironment); |
}; |