From 1b0e3aa440939ac6cfa8e5f66a615a51d0d6fda3 Mon Sep 17 00:00:00 2001 From: zijiehe Date: Mon, 21 Nov 2016 13:54:26 -0800 Subject: [PATCH] Remove deprecated CroppingWindowCapturer::Create BUG=webrtc:6513 Review-Url: https://codereview.webrtc.org/2513103003 Cr-Commit-Position: refs/heads/master@{#15173} --- .../modules/desktop_capture/cropping_window_capturer.cc | 8 ++------ webrtc/modules/desktop_capture/cropping_window_capturer.h | 2 -- .../desktop_capture/cropping_window_capturer_win.cc | 6 ------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer.cc b/webrtc/modules/desktop_capture/cropping_window_capturer.cc index d2cc0ae2e8..711fe0d1ba 100644 --- a/webrtc/modules/desktop_capture/cropping_window_capturer.cc +++ b/webrtc/modules/desktop_capture/cropping_window_capturer.cc @@ -101,12 +101,8 @@ void CroppingWindowCapturer::OnCaptureResult( } #if !defined(WEBRTC_WIN) -// static -DesktopCapturer* CroppingWindowCapturer::Create( - const DesktopCaptureOptions& options) { - return DesktopCapturer::CreateWindowCapturer(options).release(); -} - +// CroppingWindowCapturer is implemented only for windows. On other platforms +// the regular window capturer is used. // static std::unique_ptr CroppingWindowCapturer::CreateCapturer( const DesktopCaptureOptions& options) { diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer.h b/webrtc/modules/desktop_capture/cropping_window_capturer.h index fd6663e5c6..5b5a41d482 100644 --- a/webrtc/modules/desktop_capture/cropping_window_capturer.h +++ b/webrtc/modules/desktop_capture/cropping_window_capturer.h @@ -24,8 +24,6 @@ namespace webrtc { class CroppingWindowCapturer : public DesktopCapturer, public DesktopCapturer::Callback { public: - // Deprecated, use CreateCapturer() - static DesktopCapturer* Create(const DesktopCaptureOptions& options); static std::unique_ptr CreateCapturer( const DesktopCaptureOptions& options); diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc b/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc index 6ba815fc29..4cd9b8c1ee 100644 --- a/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc +++ b/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc @@ -209,12 +209,6 @@ DesktopRect CroppingWindowCapturerWin::GetWindowRectInVirtualScreen() { } // namespace -// static -DesktopCapturer* CroppingWindowCapturer::Create( - const DesktopCaptureOptions& options) { - return new CroppingWindowCapturerWin(options); -} - // static std::unique_ptr CroppingWindowCapturer::CreateCapturer( const DesktopCaptureOptions& options) {