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

Unified Diff: remoting/host/fake_host_extension.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.cc ('k') | remoting/host/fake_screen_capturer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/fake_host_extension.cc
diff --git a/remoting/host/fake_host_extension.cc b/remoting/host/fake_host_extension.cc
index ed93791142ea68299626fc0f91f6f19518c513c4..7f5c8c3f1259179aa97b627d841a57edad4c30ba 100644
--- a/remoting/host/fake_host_extension.cc
+++ b/remoting/host/fake_host_extension.cc
@@ -10,7 +10,7 @@
#include "remoting/codec/video_encoder.h"
#include "remoting/host/host_extension_session.h"
#include "remoting/proto/control.pb.h"
-#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
namespace remoting {
@@ -19,8 +19,8 @@ class FakeExtension::Session : public HostExtensionSession {
Session(FakeExtension* extension, const std::string& message_type);
virtual ~Session() {}
- virtual scoped_ptr<webrtc::ScreenCapturer> OnCreateVideoCapturer(
- scoped_ptr<webrtc::ScreenCapturer> encoder) OVERRIDE;
+ virtual scoped_ptr<webrtc::DesktopCapturer> OnCreateVideoCapturer(
+ scoped_ptr<webrtc::DesktopCapturer> encoder) OVERRIDE;
virtual scoped_ptr<VideoEncoder> OnCreateVideoEncoder(
scoped_ptr<VideoEncoder> encoder) OVERRIDE;
virtual bool ModifiesVideoPipeline() const OVERRIDE;
@@ -42,9 +42,9 @@ FakeExtension::Session::Session(
message_type_(message_type) {
}
-scoped_ptr<webrtc::ScreenCapturer>
+scoped_ptr<webrtc::DesktopCapturer>
FakeExtension::Session::OnCreateVideoCapturer(
- scoped_ptr<webrtc::ScreenCapturer> capturer) {
+ scoped_ptr<webrtc::DesktopCapturer> capturer) {
extension_->has_wrapped_video_capturer_ = true;
if (extension_->steal_video_capturer_) {
capturer.reset();
« no previous file with comments | « remoting/host/fake_desktop_environment.cc ('k') | remoting/host/fake_screen_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698