summaryrefslogtreecommitdiffstats
path: root/remoting/host/desktop_session_agent.cc
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-12 18:04:37 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-12 18:06:01 +0000
commit4e719f440bacd643b180d1eb8d7f8d038e08aebe (patch)
tree6f8ed41a75c5d9607d73f3e5b5e1ab55fcc7fa71 /remoting/host/desktop_session_agent.cc
parent35a27bf878884feab3ac9a41ddeffb493349a51a (diff)
downloadchromium_src-4e719f440bacd643b180d1eb8d7f8d038e08aebe.zip
chromium_src-4e719f440bacd643b180d1eb8d7f8d038e08aebe.tar.gz
chromium_src-4e719f440bacd643b180d1eb8d7f8d038e08aebe.tar.bz2
Switch DesktopEnvironment to return a DesktopCapturer.
This removes the need for a lot of additional boilerplate in proxying capturer implementations, and makes it possible to implement DesktopEnvironment using any kind of DesktopCapturer, e.g. ScreenCapturer or WindowCapturer, for example. Review URL: https://codereview.chromium.org/455073004 Cr-Commit-Position: refs/heads/master@{#289020} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/desktop_session_agent.cc')
-rw-r--r--remoting/host/desktop_session_agent.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index b36388f..1f75d94 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -441,11 +441,11 @@ void DesktopSessionAgent::OnCaptureFrame() {
mouse_cursor_monitor_->Capture();
- // webrtc::ScreenCapturer supports a very few (currently 2) outstanding
+ // webrtc::DesktopCapturer supports a very few (currently 2) outstanding
// capture requests. The requests are serialized on
// |video_capture_task_runner()| task runner. If the client issues more
// requests, pixel data in captured frames will likely be corrupted but
- // stability of webrtc::ScreenCapturer will not be affected.
+ // stability of webrtc::DesktopCapturer will not be affected.
video_capturer_->Capture(webrtc::DesktopRegion());
}