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

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

Issue 455073004: Switch DesktopEnvironment to return a DesktopCapturer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove ShapedDesktopCapturer::Create() Created 6 years, 4 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"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 scoped_ptr<ScreenControls> IpcDesktopEnvironment::CreateScreenControls() { 57 scoped_ptr<ScreenControls> IpcDesktopEnvironment::CreateScreenControls() {
58 return desktop_session_proxy_->CreateScreenControls(); 58 return desktop_session_proxy_->CreateScreenControls();
59 } 59 }
60 60
61 scoped_ptr<webrtc::MouseCursorMonitor> 61 scoped_ptr<webrtc::MouseCursorMonitor>
62 IpcDesktopEnvironment::CreateMouseCursorMonitor() { 62 IpcDesktopEnvironment::CreateMouseCursorMonitor() {
63 return desktop_session_proxy_->CreateMouseCursorMonitor(); 63 return desktop_session_proxy_->CreateMouseCursorMonitor();
64 } 64 }
65 65
66 scoped_ptr<webrtc::ScreenCapturer> 66 scoped_ptr<webrtc::DesktopCapturer>
67 IpcDesktopEnvironment::CreateVideoCapturer() { 67 IpcDesktopEnvironment::CreateVideoCapturer() {
68 return desktop_session_proxy_->CreateVideoCapturer(); 68 return desktop_session_proxy_->CreateVideoCapturer();
69 } 69 }
70 70
71 std::string IpcDesktopEnvironment::GetCapabilities() const { 71 std::string IpcDesktopEnvironment::GetCapabilities() const {
72 return desktop_session_proxy_->GetCapabilities(); 72 return desktop_session_proxy_->GetCapabilities();
73 } 73 }
74 74
75 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) { 75 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) {
76 return desktop_session_proxy_->SetCapabilities(capabilities); 76 return desktop_session_proxy_->SetCapabilities(capabilities);
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 if (i != active_connections_.end()) { 216 if (i != active_connections_.end()) {
217 DesktopSessionProxy* desktop_session_proxy = i->second; 217 DesktopSessionProxy* desktop_session_proxy = i->second;
218 active_connections_.erase(i); 218 active_connections_.erase(i);
219 219
220 // Disconnect the client session. 220 // Disconnect the client session.
221 desktop_session_proxy->DisconnectSession(); 221 desktop_session_proxy->DisconnectSession();
222 } 222 }
223 } 223 }
224 224
225 } // namespace remoting 225 } // 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