Index: remoting/host/curtain_mode_mac.cc |
diff --git a/remoting/host/curtain_mode_mac.cc b/remoting/host/curtain_mode_mac.cc |
index f6477e788814484a4f93560e8039404d64d8b3a6..46ab2fdb854231e156aa1ff3fd7629d3e73d3c87 100644 |
--- a/remoting/host/curtain_mode_mac.cc |
+++ b/remoting/host/curtain_mode_mac.cc |
@@ -65,9 +65,22 @@ CurtainModeMac::~CurtainModeMac() { |
void CurtainModeMac::SetActivated(bool activated) { |
if (activated) { |
- if (!ActivateCurtain()) { |
+ // If curtain mode is required, then we can't currently support remoting |
+ // the login screen. This is because we don't curtain the login screen |
+ // and the current daemon architecture means that the connction is closed |
+ // immediately after login, leaving the host system uncurtained. |
+ // |
+ // TODO(jamiewalch): Fix this once we have implemented the multi-process |
+ // daemon architecture (crbug.com/134894) |
+ if (getuid() == 0) { |
rmsousa
2012/11/07 00:19:16
IIRC (Jamie might have more details) with the curr
Jamie
2012/11/07 00:27:49
Renato is correct. This is not an error activating
Wez
2012/11/07 02:37:32
Aha; it wasn't clear to me from the comment that t
|
on_error_.Run(); |
+ return; |
} |
+ |
+ // Curtain-mode has issues on Mac OS X 10.7, so is currently disabled. |
+ //if (!ActivateCurtain()) { |
+ on_error_.Run(); |
+ //} |
} else { |
RemoveEventHandler(); |
} |