diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 18:04:37 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 18:06:01 +0000 |
| commit | 4e719f440bacd643b180d1eb8d7f8d038e08aebe (patch) | |
| tree | 6f8ed41a75c5d9607d73f3e5b5e1ab55fcc7fa71 /remoting/host/host_mock_objects.cc | |
| parent | 35a27bf878884feab3ac9a41ddeffb493349a51a (diff) | |
| download | chromium_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/host_mock_objects.cc')
| -rw-r--r-- | remoting/host/host_mock_objects.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/host_mock_objects.cc b/remoting/host/host_mock_objects.cc index aad673d..775314c 100644 --- a/remoting/host/host_mock_objects.cc +++ b/remoting/host/host_mock_objects.cc @@ -14,7 +14,7 @@ #include "remoting/host/input_injector.h" #include "remoting/proto/event.pb.h" #include "remoting/protocol/transport.h" -#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" +#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" namespace remoting { @@ -34,9 +34,9 @@ scoped_ptr<ScreenControls> MockDesktopEnvironment::CreateScreenControls() { return scoped_ptr<ScreenControls>(CreateScreenControlsPtr()); } -scoped_ptr<webrtc::ScreenCapturer> +scoped_ptr<webrtc::DesktopCapturer> MockDesktopEnvironment::CreateVideoCapturer() { - return scoped_ptr<webrtc::ScreenCapturer>(CreateVideoCapturerPtr()); + return scoped_ptr<webrtc::DesktopCapturer>(CreateVideoCapturerPtr()); } scoped_ptr<GnubbyAuthHandler> |