Improve curtain mode error message.

remoting/host/remoting_me2me_host.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.
 //
 // This file implements a standalone host process for Me2Me.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 194 matching lines @@
   bool OnNatPolicyUpdate(bool nat_traversal_enabled);
   bool OnCurtainPolicyUpdate(bool curtain_required);
   bool OnHostTalkGadgetPrefixPolicyUpdate(const std::string& talkgadget_prefix);
 
   void StartHostStatusService();
 
   void StartHost();
 
   void OnAuthFailed();
 
-  void RejectAuthenticatingClient();
+  void OnCurtainModeFailed();
+
+  void OnRemoteSessionSwitchedToConsole();
 
   // Invoked when the user uses the Disconnect windows to terminate
   // the sessions, or when the local session is activated in curtain mode.
   void OnDisconnectRequested();
 
   void RestartHost();
 
   void RestartOnHostShutdown();
 
   void Shutdown(int exit_code);
@@ skipping 79 matching lines @@
       desktop_session_connector_(NULL),
 #endif  // defined(REMOTING_MULTI_PROCESS)
       ALLOW_THIS_IN_INITIALIZER_LIST(self_(this)),
       exit_code_out_(exit_code_out) {
   // Create a NetworkChangeNotifier for use by the signalling connector.
   network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
 
   // Create the platform-specific curtain-mode implementation.
   // TODO(wez): Create this on the network thread?
   curtain_ = CurtainMode::Create(
-      base::Bind(&HostProcess::OnDisconnectRequested,
+      base::Bind(&HostProcess::OnRemoteSessionSwitchedToConsole,
                  base::Unretained(this)),
-      base::Bind(&HostProcess::RejectAuthenticatingClient,
+      base::Bind(&HostProcess::OnCurtainModeFailed,
                  base::Unretained(this)));
 
   StartOnUiThread();
 }
 
 HostProcess::~HostProcess() {
   // Verify that UI components have been torn down.
   DCHECK(!config_watcher_);
   DCHECK(!daemon_channel_);
   DCHECK(!desktop_environment_factory_);
@@ skipping 598 matching lines @@
 
   host_->Start(xmpp_login_);
 
   CreateAuthenticatorFactory();
 }
 
 void HostProcess::OnAuthFailed() {
   Shutdown(kInvalidOauthCredentialsExitCode);
 }
 
-void HostProcess::RejectAuthenticatingClient() {
+void HostProcess::OnCurtainModeFailed() {
   DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
   DCHECK(host_);
+  LOG(ERROR) << "Curtain mode failed to activate. Closing connection.";
   host_->RejectAuthenticatingClient();
 }
 
+void HostProcess::OnRemoteSessionSwitchedToConsole() {
+  LOG(INFO) << "The remote session switched was to the console."
+             << " Closing connection.";

[Sergey Ulanov, 2012/11/30 01:09:39]

nit: indentation. You can also remove "<<" here.

[Jamie, 2012/11/30 02:24:24]

Done.

+  OnDisconnectRequested();
+}
+
 // Invoked when the user uses the Disconnect windows to terminate
 // the sessions, or when the local session is activated in curtain mode.
 void HostProcess::OnDisconnectRequested() {
   if (!context_->network_task_runner()->BelongsToCurrentThread()) {
     context_->network_task_runner()->PostTask(FROM_HERE,
         base::Bind(&HostProcess::OnDisconnectRequested, this));
     return;
   }
   if (host_) {
     host_->DisconnectAllClients();
@@ skipping 170 matching lines @@
             user32.GetFunctionPointer("SetProcessDPIAware"));
     set_process_dpi_aware();
   }
 
   // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
   // the command line from GetCommandLineW(), so we can safely pass NULL here.
   return main(0, NULL);
 }
 
 #endif  // defined(OS_WIN)