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

Unified Diff: remoting/host/fake_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/fake_desktop_environment.h ('k') | remoting/host/fake_host_extension.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/fake_desktop_environment.cc
diff --git a/remoting/host/fake_desktop_environment.cc b/remoting/host/fake_desktop_environment.cc
index 135844c075a1dcb1bc77f3bb9e67cb362bd7edad..f399ae853103e46150dacc481b2543d5ae2d4f0b 100644
--- a/remoting/host/fake_desktop_environment.cc
+++ b/remoting/host/fake_desktop_environment.cc
@@ -5,7 +5,7 @@
#include "remoting/host/fake_desktop_environment.h"
#include "remoting/host/audio_capturer.h"
-#include "remoting/host/fake_screen_capturer.h"
+#include "remoting/host/fake_desktop_capturer.h"
#include "remoting/host/gnubby_auth_handler.h"
#include "remoting/host/input_injector.h"
@@ -55,12 +55,12 @@ scoped_ptr<ScreenControls> FakeDesktopEnvironment::CreateScreenControls() {
return scoped_ptr<ScreenControls>(new FakeScreenControls());
}
-scoped_ptr<webrtc::ScreenCapturer>
+scoped_ptr<webrtc::DesktopCapturer>
FakeDesktopEnvironment::CreateVideoCapturer() {
- scoped_ptr<FakeScreenCapturer> result(new FakeScreenCapturer());
+ scoped_ptr<FakeDesktopCapturer> result(new FakeDesktopCapturer());
if (!frame_generator_.is_null())
result->set_frame_generator(frame_generator_);
- return result.PassAs<webrtc::ScreenCapturer>();
+ return result.PassAs<webrtc::DesktopCapturer>();
}
scoped_ptr<webrtc::MouseCursorMonitor>
« no previous file with comments | « remoting/host/fake_desktop_environment.h ('k') | remoting/host/fake_host_extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698