Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1551)

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 13212009: Made DesktopEnvironment responsible for creation of the disconnect window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Linux & Mac. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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));

Powered by Google App Engine
This is Rietveld 408576698