Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(467)

Side by Side Diff: remoting/host/ipc_desktop_environment.cc

Issue 15692018: Remove screen capturers from media/video/capture/screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/ipc_desktop_environment.h" 5 #include "remoting/host/ipc_desktop_environment.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/process_util.h" 11 #include "base/process_util.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "ipc/ipc_sender.h" 13 #include "ipc/ipc_sender.h"
14 #include "media/video/capture/screen/screen_capturer.h"
15 #include "remoting/host/audio_capturer.h" 14 #include "remoting/host/audio_capturer.h"
16 #include "remoting/host/chromoting_messages.h" 15 #include "remoting/host/chromoting_messages.h"
17 #include "remoting/host/client_session_control.h" 16 #include "remoting/host/client_session_control.h"
18 #include "remoting/host/desktop_session.h" 17 #include "remoting/host/desktop_session.h"
19 #include "remoting/host/desktop_session_proxy.h" 18 #include "remoting/host/desktop_session_proxy.h"
20 #include "remoting/host/input_injector.h" 19 #include "remoting/host/input_injector.h"
21 #include "remoting/host/screen_controls.h" 20 #include "remoting/host/screen_controls.h"
21 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
22 22
23 namespace remoting { 23 namespace remoting {
24 24
25 IpcDesktopEnvironment::IpcDesktopEnvironment( 25 IpcDesktopEnvironment::IpcDesktopEnvironment(
26 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 26 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
27 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 27 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
28 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, 28 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
29 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 29 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
30 base::WeakPtr<ClientSessionControl> client_session_control, 30 base::WeakPtr<ClientSessionControl> client_session_control,
31 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, 31 base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
(...skipping 17 matching lines...) Expand all
49 } 49 }
50 50
51 scoped_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() { 51 scoped_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() {
52 return desktop_session_proxy_->CreateInputInjector(); 52 return desktop_session_proxy_->CreateInputInjector();
53 } 53 }
54 54
55 scoped_ptr<ScreenControls> IpcDesktopEnvironment::CreateScreenControls() { 55 scoped_ptr<ScreenControls> IpcDesktopEnvironment::CreateScreenControls() {
56 return desktop_session_proxy_->CreateScreenControls(); 56 return desktop_session_proxy_->CreateScreenControls();
57 } 57 }
58 58
59 scoped_ptr<media::ScreenCapturer> IpcDesktopEnvironment::CreateVideoCapturer() { 59 scoped_ptr<webrtc::ScreenCapturer>
60 IpcDesktopEnvironment::CreateVideoCapturer() {
60 return desktop_session_proxy_->CreateVideoCapturer(); 61 return desktop_session_proxy_->CreateVideoCapturer();
61 } 62 }
62 63
63 std::string IpcDesktopEnvironment::GetCapabilities() const { 64 std::string IpcDesktopEnvironment::GetCapabilities() const {
64 return desktop_session_proxy_->GetCapabilities(); 65 return desktop_session_proxy_->GetCapabilities();
65 } 66 }
66 67
67 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) { 68 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) {
68 return desktop_session_proxy_->SetCapabilities(capabilities); 69 return desktop_session_proxy_->SetCapabilities(capabilities);
69 } 70 }
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 if (i != active_connections_.end()) { 205 if (i != active_connections_.end()) {
205 DesktopSessionProxy* desktop_session_proxy = i->second; 206 DesktopSessionProxy* desktop_session_proxy = i->second;
206 active_connections_.erase(i); 207 active_connections_.erase(i);
207 208
208 // Disconnect the client session. 209 // Disconnect the client session.
209 desktop_session_proxy->DisconnectSession(); 210 desktop_session_proxy->DisconnectSession();
210 } 211 }
211 } 212 }
212 213
213 } // namespace remoting 214 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/ipc_desktop_environment.h ('k') | remoting/host/ipc_desktop_environment_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698