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

Unified Diff: remoting/host/desktop_process_main.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/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()))

Powered by Google App Engine
This is Rietveld 408576698