Enforce the RemoteAccessHostRequireCurtain policy on all platforms.

remoting/host/curtaining_host_observer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/curtaining_host_observer.h"
 
 #include "base/logging.h"
 #include "remoting/host/curtain_mode.h"
 #include "remoting/host/chromoting_host.h"
 
 namespace remoting {
 
 CurtainingHostObserver::CurtainingHostObserver(
     CurtainMode *curtain, scoped_refptr<ChromotingHost> host)
     : curtain_(curtain), host_(host) {
   host_->AddStatusObserver(this);
 }
 
 CurtainingHostObserver::~CurtainingHostObserver() {
   host_->RemoveStatusObserver(this);
   curtain_->SetActivated(false);
 }
 
-// TODO(jamiewalch): This code assumes at most one client connection at a time.
-// Add OnFirstClientConnected and OnLastClientDisconnected optional callbacks
-// to the HostStatusObserver interface to address this.

[Jamie, 2012/11/07 00:27:49]

Please reinstate this TODO in some form. If you think it's worth adding the list
of clients to this class for now, then that's fine, but I think the correct
long-term solution is to centralize that logic somewhere.

[Wez, 2012/11/07 02:37:32]

Most of our uses of HostObserver will disappear into DesktopEnvironment[Factory]
in due course, so I don't think that optimization is worthwhile.

[Jamie, 2012/11/07 22:28:02]

Fair enough, but we'll still want to centralize the handling of first/last
client state, so I think a TODO is still valuable.

[Wez, 2012/11/07 22:33:06]

No, we won't; this way of handling "curtaining" will eventually be replaced in
the daemon model.  Let's discuss offline. :)

+void CurtainingHostObserver::SetEnableCurtaining(bool enable) {
+  enable_curtaining_ = enable;
+  curtain_->SetActivated(enable_curtaining_ && !active_clients_.empty());
+}
+
 void CurtainingHostObserver::OnClientAuthenticated(const std::string& jid) {
-  if (curtain_->required()) {
-    curtain_->SetActivated(true);
-  }
+  active_clients_.insert(jid);
+  curtain_->SetActivated(enable_curtaining_ && !active_clients_.empty());
 }
 
 void CurtainingHostObserver::OnClientDisconnected(const std::string& jid) {
-  curtain_->SetActivated(false);
+  active_clients_.erase(jid);
+  curtain_->SetActivated(enable_curtaining_ && !active_clients_.empty());
 }
 
 }  // namespace remoting