Chromium Code Reviews| 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/audio_capturer.h" | 10 #include "remoting/host/audio_capturer.h" |
| 11 #include "remoting/host/client_session_control.h" | 11 #include "remoting/host/client_session_control.h" |
| 12 #include "remoting/host/desktop_resizer.h" | 12 #include "remoting/host/desktop_resizer.h" |
| 13 #include "remoting/host/event_executor.h" | 13 #include "remoting/host/event_executor.h" |
| 14 #include "remoting/host/local_input_monitor.h" | |
|
Sergey Ulanov
2013/03/23 19:54:22
Don't need this
alexeypa (please no reviews)
2013/03/25 15:54:07
Done.
| |
| 14 #include "remoting/host/resizing_host_observer.h" | 15 #include "remoting/host/resizing_host_observer.h" |
| 15 #include "remoting/host/screen_controls.h" | 16 #include "remoting/host/screen_controls.h" |
| 16 | 17 |
| 17 namespace remoting { | 18 namespace remoting { |
| 18 | 19 |
| 19 Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() { | 20 Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() { |
| 20 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 21 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
| 21 } | 22 } |
| 22 | 23 |
| 23 scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() { | 24 scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() { |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 68 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
| 68 | 69 |
| 69 return scoped_ptr<DesktopEnvironment>( | 70 return scoped_ptr<DesktopEnvironment>( |
| 70 new Me2MeDesktopEnvironment(caller_task_runner(), | 71 new Me2MeDesktopEnvironment(caller_task_runner(), |
| 71 input_task_runner(), | 72 input_task_runner(), |
| 72 ui_task_runner(), | 73 ui_task_runner(), |
| 73 client_session_control)); | 74 client_session_control)); |
| 74 } | 75 } |
| 75 | 76 |
| 76 } // namespace remoting | 77 } // namespace remoting |
| OLD | NEW |