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

Unified Diff: remoting/host/daemon_process_win.cc

Issue 12544020: Remote RDP sessions, rather than the console, if curtain-mode is configured. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing remoting_unittests 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
« no previous file with comments | « remoting/host/daemon_process.cc ('k') | remoting/host/desktop_session_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/daemon_process_win.cc
diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc
index 1a042d5ecb1629cb6187ce1ce9930620e6c1762b..75537ddf23d770ff3acf1086a85b584a7baaf575 100644
--- a/remoting/host/daemon_process_win.cc
+++ b/remoting/host/daemon_process_win.cc
@@ -25,7 +25,6 @@
#include "remoting/host/host_exit_codes.h"
#include "remoting/host/host_main.h"
#include "remoting/host/ipc_constants.h"
-#include "remoting/host/win/host_service.h"
#include "remoting/host/win/launch_process_with_token.h"
#include "remoting/host/win/unprivileged_process_delegate.h"
#include "remoting/host/win/worker_process_launcher.h"
@@ -151,9 +150,13 @@ scoped_ptr<DesktopSession> DaemonProcessWin::DoCreateDesktopSession(
bool virtual_terminal) {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
- return scoped_ptr<DesktopSession>(new DesktopSessionWin(
- caller_task_runner(), io_task_runner(), this, terminal_id,
- params, virtual_terminal, HostService::GetInstance()));
+ if (virtual_terminal) {
+ return DesktopSessionWin::CreateForVirtualTerminal(
+ caller_task_runner(), io_task_runner(), this, terminal_id, params);
+ } else {
+ return DesktopSessionWin::CreateForConsole(
+ caller_task_runner(), io_task_runner(), this, terminal_id, params);
+ }
}
void DaemonProcessWin::DoCrashNetworkProcess(
« no previous file with comments | « remoting/host/daemon_process.cc ('k') | remoting/host/desktop_session_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698