Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/host/me2me_desktop_environment.h" | 5 #include "remoting/host/me2me_desktop_environment.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 client_session_control); | 80 client_session_control); |
| 81 bool active = curtain_->Activate(); | 81 bool active = curtain_->Activate(); |
| 82 if (!active) | 82 if (!active) |
| 83 LOG(ERROR) << "Failed to activate the curtain mode."; | 83 LOG(ERROR) << "Failed to activate the curtain mode."; |
| 84 return active; | 84 return active; |
| 85 } | 85 } |
| 86 | 86 |
| 87 // Otherwise, if the session is shared with the local user start monitoring | 87 // Otherwise, if the session is shared with the local user start monitoring |
| 88 // the local input and create the in-session UI. | 88 // the local input and create the in-session UI. |
| 89 | 89 |
| 90 #if defined(OS_LINUX) | 90 #if defined(OS_LINUX) || defined(OS_ANDROID) |
|
Sergey Ulanov
2016/04/07 00:56:14
I think this should default to true. We can disabl
Lambros
2016/04/12 21:58:04
Done.
| |
| 91 bool want_user_interface = false; | 91 bool want_user_interface = false; |
| 92 #elif defined(OS_MACOSX) | 92 #elif defined(OS_MACOSX) |
| 93 // Don't try to display any UI on top of the system's login screen as this | 93 // Don't try to display any UI on top of the system's login screen as this |
| 94 // is rejected by the Window Server on OS X 10.7.4, and prevents the | 94 // is rejected by the Window Server on OS X 10.7.4, and prevents the |
| 95 // capturer from working (http://crbug.com/140984). | 95 // capturer from working (http://crbug.com/140984). |
| 96 | 96 |
| 97 // TODO(lambroslambrou): Use a better technique of detecting whether we're | 97 // TODO(lambroslambrou): Use a better technique of detecting whether we're |
| 98 // running in the LoginWindow context, and refactor this into a separate | 98 // running in the LoginWindow context, and refactor this into a separate |
| 99 // function to be used here and in CurtainMode::ActivateCurtain(). | 99 // function to be used here and in CurtainMode::ActivateCurtain(). |
| 100 bool want_user_interface = getuid() != 0; | 100 bool want_user_interface = getuid() != 0; |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 148 return std::move(desktop_environment); | 148 return std::move(desktop_environment); |
| 149 } | 149 } |
| 150 | 150 |
| 151 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { | 151 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { |
| 152 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 152 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
| 153 | 153 |
| 154 curtain_enabled_ = enable; | 154 curtain_enabled_ = enable; |
| 155 } | 155 } |
| 156 | 156 |
| 157 } // namespace remoting | 157 } // namespace remoting |
| OLD | NEW |