| 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 "media/video/capture/screen/screen_capturer.h" | 9 #include "media/video/capture/screen/screen_capturer.h" |
| 10 #include "remoting/host/audio_capturer.h" | 10 #include "remoting/host/audio_capturer.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 ui_task_runner(), | 27 ui_task_runner(), |
| 28 inject_sas_)); | 28 inject_sas_)); |
| 29 return input_injector.Pass(); | 29 return input_injector.Pass(); |
| 30 } | 30 } |
| 31 | 31 |
| 32 SessionDesktopEnvironment::SessionDesktopEnvironment( | 32 SessionDesktopEnvironment::SessionDesktopEnvironment( |
| 33 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 33 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 34 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 34 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
| 35 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 35 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 36 base::WeakPtr<ClientSessionControl> client_session_control, | 36 base::WeakPtr<ClientSessionControl> client_session_control, |
| 37 const UiStrings* ui_strings, | 37 const UiStrings& ui_strings, |
| 38 const base::Closure& inject_sas) | 38 const base::Closure& inject_sas) |
| 39 : Me2MeDesktopEnvironment(caller_task_runner, | 39 : Me2MeDesktopEnvironment(caller_task_runner, |
| 40 input_task_runner, | 40 input_task_runner, |
| 41 ui_task_runner, | 41 ui_task_runner, |
| 42 client_session_control, | 42 client_session_control, |
| 43 ui_strings), | 43 ui_strings), |
| 44 inject_sas_(inject_sas) { | 44 inject_sas_(inject_sas) { |
| 45 } | 45 } |
| 46 | 46 |
| 47 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( | 47 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( |
| (...skipping 15 matching lines...) Expand all Loading... |
| 63 | 63 |
| 64 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create( | 64 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create( |
| 65 base::WeakPtr<ClientSessionControl> client_session_control) { | 65 base::WeakPtr<ClientSessionControl> client_session_control) { |
| 66 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 66 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
| 67 | 67 |
| 68 return scoped_ptr<DesktopEnvironment>( | 68 return scoped_ptr<DesktopEnvironment>( |
| 69 new SessionDesktopEnvironment(caller_task_runner(), | 69 new SessionDesktopEnvironment(caller_task_runner(), |
| 70 input_task_runner(), | 70 input_task_runner(), |
| 71 ui_task_runner(), | 71 ui_task_runner(), |
| 72 client_session_control, | 72 client_session_control, |
| 73 &ui_strings(), | 73 ui_strings(), |
| 74 inject_sas_)); | 74 inject_sas_)); |
| 75 } | 75 } |
| 76 | 76 |
| 77 } // namespace remoting | 77 } // namespace remoting |
| OLD | NEW |