Revert 154009 - Merge 153610 - remoting_me2me_host: Don't try to display UI on top of Mac login screen

This merge broke the build due to a missing include.

Trying to display the Disconnect window causes rejection from the Window Server on
OS X 10.7.4, preventing the capturer from working.

BUG=140984
TEST=Verify Chromoting works on the system login screen.


Review URL: https://chromiumcodereview.appspot.com/10883033

TBR=lambroslambrou@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10889049

TBR=garykac@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10899045

git-svn-id: svn://svn.chromium.org/chrome/branches/1229/src@154032 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 24 deletions

diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 9845ab0..658d8b5 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -209,25 +209,8 @@ class HostProcess
     }
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
-    bool want_user_interface = true;
-
-#if defined(OS_MACOSX)
-    // Don't try to display any UI on top of the system's login screen as this
-    // is rejected by the Window Server on OS X 10.7.4, and prevents the
-    // capturer from working (http://crbug.com/140984).
-    base::mac::ScopedCFTypeRef<CFDictionaryRef> session(
-        CGSessionCopyCurrentDictionary());
-    const void* logged_in = CFDictionaryGetValue(session,
-                                                 kCGSessionLoginDoneKey);
-    if (logged_in != kCFBooleanTrue) {
-      want_user_interface = false;
-    }
-#endif  // OS_MACOSX
-
-    if (want_user_interface) {
-      host_user_interface_.reset(new HostUserInterface(context_.get()));
-    }
-#endif  // OS_MACOSX || OS_WIN
+    host_user_interface_.reset(new HostUserInterface(context_.get()));
+#endif
 
     StartWatchingPolicy();
 
@@ -458,11 +441,9 @@ class HostProcess
     host_event_logger_ = HostEventLogger::Create(host_, kApplicationName);
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
-    if (host_user_interface_.get()) {
-      host_user_interface_->Start(
-          host_, base::Bind(&HostProcess::OnDisconnectRequested,
-                            base::Unretained(this)));
-    }
+    host_user_interface_->Start(
+        host_, base::Bind(&HostProcess::OnDisconnectRequested,
+                          base::Unretained(this)));
 #endif
 
     host_->Start();