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

Unified Diff: remoting/host/desktop_session_agent.cc

Issue 2529533003: Pass DesktopEnvironmentOptions form network to desktop process. (Closed)
Patch Set: Created 4 years, 1 month 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_session_agent.cc
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index 852c78ac606d33c66d1081d22480e0538aa4c7d9..43862d1452c854e0e6c79d4b5c11d08a724f7f91 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -159,13 +159,11 @@ DesktopSessionAgent::DesktopSessionAgent(
scoped_refptr<AutoThreadTaskRunner> audio_capture_task_runner,
scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
scoped_refptr<AutoThreadTaskRunner> input_task_runner,
- scoped_refptr<AutoThreadTaskRunner> io_task_runner,
- const DesktopEnvironmentOptions& desktop_environment_options)
+ scoped_refptr<AutoThreadTaskRunner> io_task_runner)
: audio_capture_task_runner_(audio_capture_task_runner),
caller_task_runner_(caller_task_runner),
input_task_runner_(input_task_runner),
io_task_runner_(io_task_runner),
- desktop_environment_options_(desktop_environment_options),
weak_factory_(this) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
}
@@ -255,7 +253,7 @@ void DesktopSessionAgent::SetDisableInputs(bool disable_inputs) {
void DesktopSessionAgent::OnStartSessionAgent(
const std::string& authenticated_jid,
const ScreenResolution& resolution,
- bool virtual_terminal) {
+ const remoting::DesktopEnvironmentOptions& options) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
DCHECK(!started_);
DCHECK(!audio_capturer_);
@@ -267,10 +265,6 @@ void DesktopSessionAgent::OnStartSessionAgent(
started_ = true;
client_jid_ = authenticated_jid;
- DesktopEnvironmentOptions options = desktop_environment_options_;
- // Enable the curtain mode.
- options.set_enable_curtaining(virtual_terminal);
-
// Create a desktop environment for the new session.
desktop_environment_ = delegate_->desktop_environment_factory().Create(
weak_factory_.GetWeakPtr(), options);

Powered by Google App Engine
This is Rietveld 408576698