Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: remoting/host/it2me_desktop_environment.cc

Issue 13461029: The continue window is owned by the desktop environment now. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/it2me_desktop_environment.h ('k') | remoting/host/it2me_host_user_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/it2me_desktop_environment.cc
diff --git a/remoting/host/it2me_desktop_environment.cc b/remoting/host/it2me_desktop_environment.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2d6c183307d0516807e36678b7ee5b1343406b0a
--- /dev/null
+++ b/remoting/host/it2me_desktop_environment.cc
@@ -0,0 +1,101 @@
+// Copyright 2013 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/it2me_desktop_environment.h"
+
+#include "base/logging.h"
+#include "base/single_thread_task_runner.h"
+#include "remoting/host/client_session_control.h"
+#include "remoting/host/host_window.h"
+#include "remoting/host/host_window_proxy.h"
+#include "remoting/host/local_input_monitor.h"
+
+#if defined(OS_POSIX)
+#include <sys/types.h>
+#include <unistd.h>
+#endif // defined(OS_POSIX)
+
+namespace remoting {
+
+It2MeDesktopEnvironment::~It2MeDesktopEnvironment() {
+ DCHECK(caller_task_runner()->BelongsToCurrentThread());
+}
+
+It2MeDesktopEnvironment::It2MeDesktopEnvironment(
+ scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+ scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
+ base::WeakPtr<ClientSessionControl> client_session_control,
+ const UiStrings& ui_strings)
+ : BasicDesktopEnvironment(caller_task_runner,
+ input_task_runner,
+ ui_task_runner,
+ client_session_control,
+ ui_strings) {
+ DCHECK(caller_task_runner->BelongsToCurrentThread());
+
+ // Create the local input monitor.
+ local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner,
+ input_task_runner,
+ ui_task_runner,
+ client_session_control);
+
+ // The host UI should be created on the UI thread.
+ 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).
+
+ // TODO(lambroslambrou): Use a better technique of detecting whether we're
+ // running in the LoginWindow context, and refactor this into a separate
+ // function to be used here and in CurtainMode::ActivateCurtain().
+ want_user_interface = getuid() != 0;
+#endif // defined(OS_MACOSX)
+
+ // Create the continue and disconnect windows.
+ if (want_user_interface) {
+ continue_window_ = HostWindow::CreateContinueWindow(ui_strings);
+ continue_window_.reset(new HostWindowProxy(
+ caller_task_runner,
+ ui_task_runner,
+ continue_window_.Pass()));
+ continue_window_->Start(client_session_control);
+
+ disconnect_window_ = HostWindow::CreateDisconnectWindow(ui_strings);
+ disconnect_window_.reset(new HostWindowProxy(
+ caller_task_runner,
+ ui_task_runner,
+ disconnect_window_.Pass()));
+ disconnect_window_->Start(client_session_control);
+ }
+}
+
+It2MeDesktopEnvironmentFactory::It2MeDesktopEnvironmentFactory(
+ scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+ scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
+ const UiStrings& ui_strings)
+ : BasicDesktopEnvironmentFactory(caller_task_runner,
+ input_task_runner,
+ ui_task_runner,
+ ui_strings) {
+}
+
+It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() {
+}
+
+scoped_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create(
+ base::WeakPtr<ClientSessionControl> client_session_control) {
+ DCHECK(caller_task_runner()->BelongsToCurrentThread());
+
+ return scoped_ptr<DesktopEnvironment>(
+ new It2MeDesktopEnvironment(caller_task_runner(),
+ input_task_runner(),
+ ui_task_runner(),
+ client_session_control,
+ ui_strings()));
+}
+
+} // namespace remoting
« no previous file with comments | « remoting/host/it2me_desktop_environment.h ('k') | remoting/host/it2me_host_user_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698