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 "media/video/capture/screen/screen_capturer.h" | 9 #include "media/video/capture/screen/screen_capturer.h" |
10 #include "remoting/host/client_session_control.h" | 10 #include "remoting/host/client_session_control.h" |
11 #include "remoting/host/desktop_resizer.h" | 11 #include "remoting/host/desktop_resizer.h" |
12 #include "remoting/host/host_window.h" | 12 #include "remoting/host/host_window.h" |
13 #include "remoting/host/resizing_host_observer.h" | 13 #include "remoting/host/resizing_host_observer.h" |
14 #include "remoting/host/screen_controls.h" | 14 #include "remoting/host/screen_controls.h" |
15 #include "remoting/host/ui_strings.h" | |
16 | 15 |
17 namespace remoting { | 16 namespace remoting { |
18 | 17 |
19 Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() { | 18 Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() { |
20 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 19 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
21 } | 20 } |
22 | 21 |
23 scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() { | 22 scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() { |
24 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 23 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
25 | 24 |
(...skipping 10 matching lines...) Expand all Loading... |
36 #else // !defined(OS_LINUX) | 35 #else // !defined(OS_LINUX) |
37 return media::ScreenCapturer::Create(); | 36 return media::ScreenCapturer::Create(); |
38 #endif // !defined(OS_LINUX) | 37 #endif // !defined(OS_LINUX) |
39 } | 38 } |
40 | 39 |
41 Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( | 40 Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( |
42 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 41 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
43 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 42 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
44 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 43 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
45 base::WeakPtr<ClientSessionControl> client_session_control, | 44 base::WeakPtr<ClientSessionControl> client_session_control, |
46 const UiStrings* ui_strings) | 45 const UiStrings& ui_strings) |
47 : BasicDesktopEnvironment(caller_task_runner, | 46 : BasicDesktopEnvironment(caller_task_runner, |
48 input_task_runner, | 47 input_task_runner, |
49 ui_task_runner, | 48 ui_task_runner, |
50 client_session_control, | 49 client_session_control, |
51 ui_strings) { | 50 ui_strings) { |
52 DCHECK(caller_task_runner->BelongsToCurrentThread()); | 51 DCHECK(caller_task_runner->BelongsToCurrentThread()); |
53 } | 52 } |
54 | 53 |
55 Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory( | 54 Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory( |
56 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 55 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
(...skipping 11 matching lines...) Expand all Loading... |
68 | 67 |
69 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( | 68 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( |
70 base::WeakPtr<ClientSessionControl> client_session_control) { | 69 base::WeakPtr<ClientSessionControl> client_session_control) { |
71 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 70 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
72 | 71 |
73 return scoped_ptr<DesktopEnvironment>( | 72 return scoped_ptr<DesktopEnvironment>( |
74 new Me2MeDesktopEnvironment(caller_task_runner(), | 73 new Me2MeDesktopEnvironment(caller_task_runner(), |
75 input_task_runner(), | 74 input_task_runner(), |
76 ui_task_runner(), | 75 ui_task_runner(), |
77 client_session_control, | 76 client_session_control, |
78 &ui_strings())); | 77 ui_strings())); |
79 } | 78 } |
80 | 79 |
81 } // namespace remoting | 80 } // namespace remoting |
OLD | NEW |