| Index: remoting/host/remoting_me2me_host.cc
|
| diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
|
| index 2614950375c408ac8c7971ca0bc8f7a75efc18ad..27e7cfefa820ec16062ac238319afa2bcb6ef4dd 100644
|
| --- a/remoting/host/remoting_me2me_host.cc
|
| +++ b/remoting/host/remoting_me2me_host.cc
|
| @@ -551,6 +551,9 @@ void HostProcess::StartOnUiThread() {
|
| }
|
| #endif // defined(OS_LINUX)
|
|
|
| + // TODO(alexeypa): Localize the UI strings. See http://crbug.com/155204.
|
| + UiStrings ui_strings;
|
| +
|
| // Create a desktop environment factory appropriate to the build type &
|
| // platform.
|
| #if defined(OS_WIN)
|
| @@ -570,6 +573,7 @@ void HostProcess::StartOnUiThread() {
|
| context_->network_task_runner(),
|
| context_->input_task_runner(),
|
| context_->ui_task_runner(),
|
| + ui_strings,
|
| base::Bind(&HostProcess::SendSasToConsole, this));
|
| #endif // !defined(REMOTING_MULTI_PROCESS)
|
|
|
| @@ -578,7 +582,8 @@ void HostProcess::StartOnUiThread() {
|
| new Me2MeDesktopEnvironmentFactory(
|
| context_->network_task_runner(),
|
| context_->input_task_runner(),
|
| - context_->ui_task_runner());
|
| + context_->ui_task_runner(),
|
| + ui_strings);
|
| #endif // !defined(OS_WIN)
|
|
|
| desktop_environment_factory_.reset(desktop_environment_factory);
|
| @@ -599,7 +604,6 @@ void HostProcess::StartOnUiThread() {
|
| #endif // OS_MACOSX
|
|
|
| if (want_user_interface) {
|
| - UiStrings ui_strings;
|
| host_user_interface_.reset(
|
| new HostUserInterface(context_->network_task_runner(),
|
| context_->ui_task_runner(), ui_strings));
|
|
|