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 26 matching lines...) Expand all Loading... |
37 : Me2MeDesktopEnvironment(caller_task_runner, | 37 : Me2MeDesktopEnvironment(caller_task_runner, |
38 input_task_runner, | 38 input_task_runner, |
39 ui_task_runner), | 39 ui_task_runner), |
40 inject_sas_(inject_sas) { | 40 inject_sas_(inject_sas) { |
41 } | 41 } |
42 | 42 |
43 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( | 43 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( |
44 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 44 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
45 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 45 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
46 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 46 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
47 const UiStrings& ui_strings, | |
48 const base::Closure& inject_sas) | 47 const base::Closure& inject_sas) |
49 : Me2MeDesktopEnvironmentFactory(caller_task_runner, | 48 : Me2MeDesktopEnvironmentFactory(caller_task_runner, |
50 input_task_runner, | 49 input_task_runner, |
51 ui_task_runner, | 50 ui_task_runner), |
52 ui_strings), | |
53 inject_sas_(inject_sas) { | 51 inject_sas_(inject_sas) { |
54 DCHECK(caller_task_runner->BelongsToCurrentThread()); | 52 DCHECK(caller_task_runner->BelongsToCurrentThread()); |
55 } | 53 } |
56 | 54 |
57 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() { | 55 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() { |
58 } | 56 } |
59 | 57 |
60 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create( | 58 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create( |
61 base::WeakPtr<ClientSessionControl> client_session_control) { | 59 base::WeakPtr<ClientSessionControl> client_session_control) { |
62 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 60 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
63 | 61 |
64 scoped_ptr<SessionDesktopEnvironment> desktop_environment( | 62 scoped_ptr<SessionDesktopEnvironment> desktop_environment( |
65 new SessionDesktopEnvironment(caller_task_runner(), | 63 new SessionDesktopEnvironment(caller_task_runner(), |
66 input_task_runner(), | 64 input_task_runner(), |
67 ui_task_runner(), | 65 ui_task_runner(), |
68 inject_sas_)); | 66 inject_sas_)); |
69 if (!desktop_environment->InitializeSecurity(client_session_control, | 67 if (!desktop_environment->InitializeSecurity(client_session_control, |
70 ui_strings(), | |
71 curtain_enabled())) { | 68 curtain_enabled())) { |
72 return scoped_ptr<DesktopEnvironment>(); | 69 return scoped_ptr<DesktopEnvironment>(); |
73 } | 70 } |
74 | 71 |
75 return desktop_environment.PassAs<DesktopEnvironment>(); | 72 return desktop_environment.PassAs<DesktopEnvironment>(); |
76 } | 73 } |
77 | 74 |
78 } // namespace remoting | 75 } // namespace remoting |
OLD | NEW |