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

Unified Diff: remoting/host/me2me_desktop_environment.cc

Issue 15692018: Remove screen capturers from media/video/capture/screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/me2me_desktop_environment.h ('k') | remoting/host/sas_injector_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/me2me_desktop_environment.cc
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc
index 9dc6d2f051a40d0917aa89964ba0299b078a6b71..6f5526253025482c2a0da760c1614ad49b1fa3bf 100644
--- a/remoting/host/me2me_desktop_environment.cc
+++ b/remoting/host/me2me_desktop_environment.cc
@@ -6,7 +6,6 @@
#include "base/logging.h"
#include "base/single_thread_task_runner.h"
-#include "media/video/capture/screen/screen_capturer.h"
#include "remoting/host/client_session_control.h"
#include "remoting/host/curtain_mode.h"
#include "remoting/host/desktop_resizer.h"
@@ -16,6 +15,7 @@
#include "remoting/host/local_input_monitor.h"
#include "remoting/host/resizing_host_observer.h"
#include "remoting/host/screen_controls.h"
+#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
#if defined(OS_POSIX)
#include <sys/types.h>
@@ -35,14 +35,15 @@ scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() {
new ResizingHostObserver(DesktopResizer::Create()));
}
-scoped_ptr<media::ScreenCapturer>
+scoped_ptr<webrtc::ScreenCapturer>
Me2MeDesktopEnvironment::CreateVideoCapturer() {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
#if defined(OS_LINUX)
- return media::ScreenCapturer::CreateWithXDamage(true);
+ return scoped_ptr<webrtc::ScreenCapturer>(
+ webrtc::ScreenCapturer::CreateWithXDamage(true));
#else // !defined(OS_LINUX)
- return media::ScreenCapturer::Create();
+ return scoped_ptr<webrtc::ScreenCapturer>(webrtc::ScreenCapturer::Create());
#endif // !defined(OS_LINUX)
}
« no previous file with comments | « remoting/host/me2me_desktop_environment.h ('k') | remoting/host/sas_injector_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698