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

Unified Diff: remoting/host/client_session.cc

Issue 11028128: [Chromoting] Request the daemon to open a terminal once a connection has been accepted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 2 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/client_session.h ('k') | remoting/host/client_session_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/client_session.cc
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc
index 8a9b84295a254909421011425b08d6bddefc407f..eef2fa68ef5039c78686199807c3b935bad2b3d6 100644
--- a/remoting/host/client_session.cc
+++ b/remoting/host/client_session.cc
@@ -15,6 +15,7 @@
#include "remoting/codec/video_encoder_vp8.h"
#include "remoting/host/audio_scheduler.h"
#include "remoting/host/desktop_environment.h"
+#include "remoting/host/desktop_environment_factory.h"
#include "remoting/host/event_executor.h"
#include "remoting/host/screen_recorder.h"
#include "remoting/host/video_frame_capturer.h"
@@ -31,11 +32,12 @@ ClientSession::ClientSession(
scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
scoped_ptr<protocol::ConnectionToClient> connection,
- scoped_ptr<DesktopEnvironment> desktop_environment,
+ DesktopEnvironmentFactory* desktop_environment_factory,
const base::TimeDelta& max_duration)
: event_handler_(event_handler),
connection_(connection.Pass()),
- desktop_environment_(desktop_environment.Pass()),
+ desktop_environment_(desktop_environment_factory->Create(
+ ALLOW_THIS_IN_INITIALIZER_LIST(this))),
client_jid_(connection_->session()->jid()),
host_clipboard_stub_(desktop_environment_->event_executor()),
host_input_stub_(desktop_environment_->event_executor()),
« no previous file with comments | « remoting/host/client_session.h ('k') | remoting/host/client_session_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698