| Index: webrtc/modules/desktop_capture/window_capturer.h
|
| diff --git a/webrtc/modules/desktop_capture/window_capturer.h b/webrtc/modules/desktop_capture/window_capturer.h
|
| index 4ef07aa1a200220650f90702ba39e88573487044..682778c5586126903ebc4464716f0cf95f87dcb8 100644
|
| --- a/webrtc/modules/desktop_capture/window_capturer.h
|
| +++ b/webrtc/modules/desktop_capture/window_capturer.h
|
| @@ -23,9 +23,10 @@
|
|
|
| class DesktopCaptureOptions;
|
|
|
| -// TODO(zijiehe): Remove this class.
|
| class WindowCapturer : public DesktopCapturer {
|
| public:
|
| + typedef webrtc::WindowId WindowId;
|
| +
|
| struct Window {
|
| WindowId id;
|
|
|
| @@ -35,29 +36,20 @@
|
|
|
| typedef std::vector<Window> WindowList;
|
|
|
| - // Consumers should use DesktopCapturer::CreateWindowCapturer.
|
| static WindowCapturer* Create(const DesktopCaptureOptions& options);
|
|
|
| - ~WindowCapturer() override;
|
| + ~WindowCapturer() override {}
|
|
|
| - // Deprecated, use GetSourceList().
|
| // Get list of windows. Returns false in case of a failure.
|
| - virtual bool GetWindowList(WindowList* windows);
|
| + virtual bool GetWindowList(WindowList* windows) = 0;
|
|
|
| - // Deprecated, use SelectSource().
|
| // Select window to be captured. Returns false in case of a failure (e.g. if
|
| // there is no window with the specified id).
|
| - virtual bool SelectWindow(WindowId id);
|
| + virtual bool SelectWindow(WindowId id) = 0;
|
|
|
| - // Deprecated, use FocusOnSelectedSource().
|
| // Bring the selected window to the front. Returns false in case of a
|
| // failure or no window selected.
|
| - virtual bool BringSelectedWindowToFront();
|
| -
|
| - // DesktopCapturer interfaces.
|
| - bool GetSourceList(SourceList* sources) override;
|
| - bool SelectSource(SourceId id) override;
|
| - bool FocusOnSelectedSource() override;
|
| + virtual bool BringSelectedWindowToFront() = 0;
|
| };
|
|
|
| } // namespace webrtc
|
|
|