summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-04 22:57:54 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-04 22:57:54 +0000
commit62ef33eaf47742141d7457421a1ba728d38f4432 (patch)
tree84b81fcc8b85bcc3f45cd8cf2d4be3e2bb597d9d
parent907efd87782924dc30bde99bdadaf02d286f2e04 (diff)
downloadchromium_src-62ef33eaf47742141d7457421a1ba728d38f4432.zip
chromium_src-62ef33eaf47742141d7457421a1ba728d38f4432.tar.gz
chromium_src-62ef33eaf47742141d7457421a1ba728d38f4432.tar.bz2
Write an error message to the debug log when the host is shutting down because of a policy setting.
BUG=179883 Review URL: https://chromiumcodereview.appspot.com/12395018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186013 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/host/curtain_mode_linux.cc2
-rw-r--r--remoting/host/curtain_mode_mac.cc1
-rw-r--r--remoting/host/curtain_mode_win.cc1
-rw-r--r--remoting/host/remoting_me2me_host.cc7
4 files changed, 9 insertions, 2 deletions
diff --git a/remoting/host/curtain_mode_linux.cc b/remoting/host/curtain_mode_linux.cc
index 61a3d97..34b4db0 100644
--- a/remoting/host/curtain_mode_linux.cc
+++ b/remoting/host/curtain_mode_linux.cc
@@ -95,6 +95,8 @@ void CurtainModeLinux::SetActivated(bool activated) {
// Either the session is running on Xvfb (i.e. always curtained), or it is
// attached to the physical console (i.e. impossible to curtain).
if (activated && !IsXvfbSession()) {
+ LOG(ERROR) << "Curtain-mode is not supported when running on non-Xvfb "
+ "X server";
on_error_.Run();
}
}
diff --git a/remoting/host/curtain_mode_mac.cc b/remoting/host/curtain_mode_mac.cc
index 7a7b8c1..bf3118b 100644
--- a/remoting/host/curtain_mode_mac.cc
+++ b/remoting/host/curtain_mode_mac.cc
@@ -91,6 +91,7 @@ bool CurtainModeMac::ActivateCurtain() {
// Try to install the switch-in handler. Do this before switching out the
// current session so that the console session is not affected if it fails.
if (!InstallEventHandler()) {
+ LOG(ERROR) << "Failed to install the switch-in handler.";
return false;
}
diff --git a/remoting/host/curtain_mode_win.cc b/remoting/host/curtain_mode_win.cc
index 8309dba..fc4cb2f 100644
--- a/remoting/host/curtain_mode_win.cc
+++ b/remoting/host/curtain_mode_win.cc
@@ -15,6 +15,7 @@ class CurtainModeWin : public CurtainMode {
virtual void SetActivated(bool activated) OVERRIDE {
// Curtain-mode is not currently implemented for Windows.
if (activated) {
+ LOG(ERROR) << "Curtain-mode is not yet supported on Windows.";
on_error_.Run();
}
}
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index f3d48b2..344fa73 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -801,6 +801,7 @@ bool HostProcess::OnUsernamePolicyUpdate(bool host_username_match_required) {
#endif
if (shutdown) {
+ LOG(ERROR) << "The host username does not match.";
ShutdownHost(kUsernameMismatchExitCode);
}
} else {
@@ -841,6 +842,8 @@ bool HostProcess::OnCurtainPolicyUpdate(bool curtain_required) {
// TODO(jamiewalch): Fix this once we have implemented the multi-process
// daemon architecture (crbug.com/134894)
if (getuid() == 0) {
+ LOG(ERROR) << "Running the host in the console login session is yet not "
+ "supported.";
ShutdownHost(kLoginScreenNotSupportedExitCode);
return false;
}
@@ -849,9 +852,9 @@ bool HostProcess::OnCurtainPolicyUpdate(bool curtain_required) {
if (curtain_required_ != curtain_required) {
if (curtain_required)
- LOG(ERROR) << "Policy requires curtain-mode.";
+ LOG(INFO) << "Policy requires curtain-mode.";
else
- LOG(ERROR) << "Policy does not require curtain-mode.";
+ LOG(INFO) << "Policy does not require curtain-mode.";
curtain_required_ = curtain_required;
if (curtaining_host_observer_)
curtaining_host_observer_->SetEnableCurtaining(curtain_required_);