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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 12379084: Pass the |curtain_activated| flag to IpcDesktopEnvironmentFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 2d1a3b7c249dca496079ae9f3e490cd25bbac52f..abd0cd03e9d118a255535cb12e51c40a99a02940 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -943,10 +943,18 @@ void HostProcess::StartHost() {
resizing_host_observer_.reset(
new ResizingHostObserver(desktop_resizer_.get(), host_->AsWeakPtr()));
+#if defined(REMOTING_RDP_SESSION)
+ // TODO(alexeypa): do not create |curtain_| in this case.
+ CurtainMode* curtain = static_cast<IpcDesktopEnvironmentFactory*>(
+ desktop_environment_factory_.get());
+#else // !defined(REMOTING_RDP_SESSION)
+ CurtainMode* curtain = curtain_.get();
+#endif // !defined(REMOTING_RDP_SESSION)
+
// Create a host observer to enable/disable curtain mode as clients connect
// and disconnect.
curtaining_host_observer_.reset(new CurtainingHostObserver(
- curtain_.get(), host_->AsWeakPtr()));
+ curtain, host_->AsWeakPtr()));
curtaining_host_observer_->SetEnableCurtaining(curtain_required_);
if (host_user_interface_.get()) {

Powered by Google App Engine
This is Rietveld 408576698