| Index: remoting/host/desktop_process_main.cc
|
| diff --git a/remoting/host/desktop_process_main.cc b/remoting/host/desktop_process_main.cc
|
| index 28dd3ed1236e23982eb77028dd7c53d663d80a0a..966acb8d869aeea977619d0a7197bb493664a354 100644
|
| --- a/remoting/host/desktop_process_main.cc
|
| +++ b/remoting/host/desktop_process_main.cc
|
| @@ -18,6 +18,7 @@
|
| #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 {
|
| @@ -45,6 +46,9 @@ 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)
|
| @@ -53,13 +57,15 @@ 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_task_runner,
|
| + ui_string));
|
| #endif // !defined(OS_WIN)
|
|
|
| if (!desktop_process.Start(desktop_environment_factory.Pass()))
|
|
|