| Index: remoting/host/desktop_process_main.cc
|
| diff --git a/remoting/host/desktop_process_main.cc b/remoting/host/desktop_process_main.cc
|
| index c259e580a44aa99512f6938221d1b7a1de3d9df9..294413c76ac2dd8faea8b2e8b20fd5454c51cdf1 100644
|
| --- a/remoting/host/desktop_process_main.cc
|
| +++ b/remoting/host/desktop_process_main.cc
|
| @@ -18,7 +18,6 @@
|
| #include "remoting/host/host_main.h"
|
| #include "remoting/host/ipc_constants.h"
|
| #include "remoting/host/me2me_desktop_environment.h"
|
| -#include "remoting/host/ui_strings.h"
|
| #include "remoting/host/win/session_desktop_environment.h"
|
|
|
| namespace remoting {
|
| @@ -46,9 +45,6 @@ int DesktopProcessMain() {
|
| input_task_runner,
|
| channel_name);
|
|
|
| - // TODO(alexeypa): Localize the UI strings. See http://crbug.com/155204.
|
| - UiStrings ui_string;
|
| -
|
| // Create a platform-dependent environment factory.
|
| scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory;
|
| #if defined(OS_WIN)
|
| @@ -57,15 +53,13 @@ int DesktopProcessMain() {
|
| ui_task_runner,
|
| input_task_runner,
|
| ui_task_runner,
|
| - ui_string,
|
| base::Bind(&DesktopProcess::InjectSas,
|
| desktop_process.AsWeakPtr())));
|
| #else // !defined(OS_WIN)
|
| desktop_environment_factory.reset(new Me2MeDesktopEnvironmentFactory(
|
| ui_task_runner,
|
| input_task_runner,
|
| - ui_task_runner,
|
| - ui_string));
|
| + ui_task_runner));
|
| #endif // !defined(OS_WIN)
|
|
|
| if (!desktop_process.Start(desktop_environment_factory.Pass()))
|
|
|