summaryrefslogtreecommitdiffstats
path: root/remoting/host/it2me_desktop_environment.cc
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/host/it2me_desktop_environment.cc')
-rw-r--r--remoting/host/it2me_desktop_environment.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/remoting/host/it2me_desktop_environment.cc b/remoting/host/it2me_desktop_environment.cc
index 6a289c9..68aa57d 100644
--- a/remoting/host/it2me_desktop_environment.cc
+++ b/remoting/host/it2me_desktop_environment.cc
@@ -26,8 +26,7 @@ It2MeDesktopEnvironment::It2MeDesktopEnvironment(
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
- base::WeakPtr<ClientSessionControl> client_session_control,
- const UiStrings& ui_strings)
+ base::WeakPtr<ClientSessionControl> client_session_control)
: BasicDesktopEnvironment(caller_task_runner,
input_task_runner,
ui_task_runner) {
@@ -54,14 +53,14 @@ It2MeDesktopEnvironment::It2MeDesktopEnvironment(
// Create the continue and disconnect windows.
if (want_user_interface) {
- continue_window_ = HostWindow::CreateContinueWindow(ui_strings);
+ continue_window_ = HostWindow::CreateContinueWindow();
continue_window_.reset(new HostWindowProxy(
caller_task_runner,
ui_task_runner,
continue_window_.Pass()));
continue_window_->Start(client_session_control);
- disconnect_window_ = HostWindow::CreateDisconnectWindow(ui_strings);
+ disconnect_window_ = HostWindow::CreateDisconnectWindow();
disconnect_window_.reset(new HostWindowProxy(
caller_task_runner,
ui_task_runner,
@@ -73,12 +72,10 @@ It2MeDesktopEnvironment::It2MeDesktopEnvironment(
It2MeDesktopEnvironmentFactory::It2MeDesktopEnvironmentFactory(
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)
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
: BasicDesktopEnvironmentFactory(caller_task_runner,
input_task_runner,
- ui_task_runner,
- ui_strings) {
+ ui_task_runner) {
}
It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() {
@@ -92,8 +89,7 @@ scoped_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create(
new It2MeDesktopEnvironment(caller_task_runner(),
input_task_runner(),
ui_task_runner(),
- client_session_control,
- ui_strings()));
+ client_session_control));
}
} // namespace remoting