| 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 "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "remoting/base/logging.h" | 9 #include "remoting/base/logging.h" |
| 10 #include "remoting/host/client_session_control.h" | 10 #include "remoting/host/client_session_control.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 // Create the disconnect window. | 109 // Create the disconnect window. |
| 110 if (want_user_interface) { | 110 if (want_user_interface) { |
| 111 // Create the local input monitor. | 111 // Create the local input monitor. |
| 112 local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner(), | 112 local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner(), |
| 113 input_task_runner(), | 113 input_task_runner(), |
| 114 ui_task_runner(), | 114 ui_task_runner(), |
| 115 client_session_control); | 115 client_session_control); |
| 116 | 116 |
| 117 disconnect_window_ = HostWindow::CreateDisconnectWindow(); | 117 disconnect_window_ = HostWindow::CreateDisconnectWindow(); |
| 118 disconnect_window_.reset(new HostWindowProxy( | 118 disconnect_window_.reset(new HostWindowProxy( |
| 119 caller_task_runner(), | 119 caller_task_runner(), ui_task_runner(), std::move(disconnect_window_))); |
| 120 ui_task_runner(), | |
| 121 disconnect_window_.Pass())); | |
| 122 disconnect_window_->Start(client_session_control); | 120 disconnect_window_->Start(client_session_control); |
| 123 } | 121 } |
| 124 | 122 |
| 125 return true; | 123 return true; |
| 126 } | 124 } |
| 127 | 125 |
| 128 void Me2MeDesktopEnvironment::SetEnableGnubbyAuth(bool gnubby_auth_enabled) { | 126 void Me2MeDesktopEnvironment::SetEnableGnubbyAuth(bool gnubby_auth_enabled) { |
| 129 gnubby_auth_enabled_ = gnubby_auth_enabled; | 127 gnubby_auth_enabled_ = gnubby_auth_enabled; |
| 130 } | 128 } |
| 131 | 129 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 150 new Me2MeDesktopEnvironment(caller_task_runner(), | 148 new Me2MeDesktopEnvironment(caller_task_runner(), |
| 151 input_task_runner(), | 149 input_task_runner(), |
| 152 ui_task_runner(), | 150 ui_task_runner(), |
| 153 supports_touch_events())); | 151 supports_touch_events())); |
| 154 if (!desktop_environment->InitializeSecurity(client_session_control, | 152 if (!desktop_environment->InitializeSecurity(client_session_control, |
| 155 curtain_enabled_)) { | 153 curtain_enabled_)) { |
| 156 return nullptr; | 154 return nullptr; |
| 157 } | 155 } |
| 158 desktop_environment->SetEnableGnubbyAuth(gnubby_auth_enabled_); | 156 desktop_environment->SetEnableGnubbyAuth(gnubby_auth_enabled_); |
| 159 | 157 |
| 160 return desktop_environment.Pass(); | 158 return std::move(desktop_environment); |
| 161 } | 159 } |
| 162 | 160 |
| 163 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { | 161 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { |
| 164 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 162 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
| 165 | 163 |
| 166 curtain_enabled_ = enable; | 164 curtain_enabled_ = enable; |
| 167 } | 165 } |
| 168 | 166 |
| 169 void Me2MeDesktopEnvironmentFactory::SetEnableGnubbyAuth( | 167 void Me2MeDesktopEnvironmentFactory::SetEnableGnubbyAuth( |
| 170 bool gnubby_auth_enabled) { | 168 bool gnubby_auth_enabled) { |
| 171 gnubby_auth_enabled_ = gnubby_auth_enabled; | 169 gnubby_auth_enabled_ = gnubby_auth_enabled; |
| 172 } | 170 } |
| 173 | 171 |
| 174 } // namespace remoting | 172 } // namespace remoting |
| OLD | NEW |