Index: remoting/host/basic_desktop_environment.cc |
diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc |
index 9174e04342de5905423034568f813cd7f2b61b39..a5b5ccb784dd034538562bf051f48fae6015b32a 100644 |
--- a/remoting/host/basic_desktop_environment.cc |
+++ b/remoting/host/basic_desktop_environment.cc |
@@ -15,7 +15,6 @@ |
#include "remoting/host/input_injector.h" |
#include "remoting/host/local_input_monitor.h" |
#include "remoting/host/screen_controls.h" |
-#include "remoting/host/ui_strings.h" |
#if defined(OS_POSIX) |
#include <sys/types.h> |
@@ -60,11 +59,10 @@ BasicDesktopEnvironment::BasicDesktopEnvironment( |
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
base::WeakPtr<ClientSessionControl> client_session_control, |
- const UiStrings* ui_strings) |
+ const UiStrings& ui_strings) |
: caller_task_runner_(caller_task_runner), |
input_task_runner_(input_task_runner), |
- ui_task_runner_(ui_task_runner), |
- ui_strings_(ui_strings) { |
+ ui_task_runner_(ui_task_runner) { |
DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
// Create the local input monitor. |
@@ -90,7 +88,7 @@ BasicDesktopEnvironment::BasicDesktopEnvironment( |
// Create the disconnect window. |
if (want_user_interface) { |
- disconnect_window_ = HostWindow::CreateDisconnectWindow(*ui_strings_); |
+ disconnect_window_ = HostWindow::CreateDisconnectWindow(ui_strings); |
disconnect_window_.reset(new HostWindowProxy( |
caller_task_runner_, |
ui_task_runner_, |
@@ -122,7 +120,7 @@ scoped_ptr<DesktopEnvironment> BasicDesktopEnvironmentFactory::Create( |
input_task_runner(), |
ui_task_runner(), |
client_session_control, |
- &ui_strings_)); |
+ ui_strings_)); |
} |
bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { |