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/win/session_desktop_environment.h" | 5 #include "remoting/host/win/session_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/host/audio_capturer.h" | 9 #include "remoting/host/audio_capturer.h" |
10 #include "remoting/host/input_injector.h" | 10 #include "remoting/host/input_injector.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 base::WeakPtr<ClientSessionControl> client_session_control) { | 59 base::WeakPtr<ClientSessionControl> client_session_control) { |
60 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 60 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
61 | 61 |
62 scoped_ptr<SessionDesktopEnvironment> desktop_environment( | 62 scoped_ptr<SessionDesktopEnvironment> desktop_environment( |
63 new SessionDesktopEnvironment(caller_task_runner(), | 63 new SessionDesktopEnvironment(caller_task_runner(), |
64 input_task_runner(), | 64 input_task_runner(), |
65 ui_task_runner(), | 65 ui_task_runner(), |
66 inject_sas_)); | 66 inject_sas_)); |
67 if (!desktop_environment->InitializeSecurity(client_session_control, | 67 if (!desktop_environment->InitializeSecurity(client_session_control, |
68 curtain_enabled())) { | 68 curtain_enabled())) { |
69 return scoped_ptr<DesktopEnvironment>(); | 69 return nullptr; |
70 } | 70 } |
71 | 71 |
72 return desktop_environment.PassAs<DesktopEnvironment>(); | 72 return desktop_environment.Pass(); |
73 } | 73 } |
74 | 74 |
75 } // namespace remoting | 75 } // namespace remoting |
OLD | NEW |