| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_H_ | 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_H_ | 
| 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_H_ | 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_H_ | 
| 13 | 13 | 
| 14 #include <string> | 14 #include <string> | 
| 15 #include <vector> | 15 #include <vector> | 
| 16 | 16 | 
| 17 #include "webrtc/base/constructormagic.h" | 17 #include "webrtc/base/constructormagic.h" | 
| 18 #include "webrtc/modules/desktop_capture/desktop_capture_types.h" | 18 #include "webrtc/modules/desktop_capture/desktop_capture_types.h" | 
| 19 #include "webrtc/modules/desktop_capture/desktop_capturer.h" | 19 #include "webrtc/modules/desktop_capture/desktop_capturer.h" | 
| 20 #include "webrtc/typedefs.h" | 20 #include "webrtc/typedefs.h" | 
| 21 | 21 | 
| 22 namespace webrtc { | 22 namespace webrtc { | 
| 23 | 23 | 
| 24 class DesktopCaptureOptions; | 24 class DesktopCaptureOptions; | 
| 25 | 25 | 
| 26 // TODO(zijiehe): Remove this class. |  | 
| 27 class WindowCapturer : public DesktopCapturer { | 26 class WindowCapturer : public DesktopCapturer { | 
| 28  public: | 27  public: | 
|  | 28   typedef webrtc::WindowId WindowId; | 
|  | 29 | 
| 29   struct Window { | 30   struct Window { | 
| 30     WindowId id; | 31     WindowId id; | 
| 31 | 32 | 
| 32     // Title of the window in UTF-8 encoding. | 33     // Title of the window in UTF-8 encoding. | 
| 33     std::string title; | 34     std::string title; | 
| 34   }; | 35   }; | 
| 35 | 36 | 
| 36   typedef std::vector<Window> WindowList; | 37   typedef std::vector<Window> WindowList; | 
| 37 | 38 | 
| 38   // Consumers should use DesktopCapturer::CreateWindowCapturer. |  | 
| 39   static WindowCapturer* Create(const DesktopCaptureOptions& options); | 39   static WindowCapturer* Create(const DesktopCaptureOptions& options); | 
| 40 | 40 | 
| 41   ~WindowCapturer() override; | 41   ~WindowCapturer() override {} | 
| 42 | 42 | 
| 43   // Deprecated, use GetSourceList(). |  | 
| 44   // Get list of windows. Returns false in case of a failure. | 43   // Get list of windows. Returns false in case of a failure. | 
| 45   virtual bool GetWindowList(WindowList* windows); | 44   virtual bool GetWindowList(WindowList* windows) = 0; | 
| 46 | 45 | 
| 47   // Deprecated, use SelectSource(). |  | 
| 48   // Select window to be captured. Returns false in case of a failure (e.g. if | 46   // Select window to be captured. Returns false in case of a failure (e.g. if | 
| 49   // there is no window with the specified id). | 47   // there is no window with the specified id). | 
| 50   virtual bool SelectWindow(WindowId id); | 48   virtual bool SelectWindow(WindowId id) = 0; | 
| 51 | 49 | 
| 52   // Deprecated, use FocusOnSelectedSource(). |  | 
| 53   // Bring the selected window to the front. Returns false in case of a | 50   // Bring the selected window to the front. Returns false in case of a | 
| 54   // failure or no window selected. | 51   // failure or no window selected. | 
| 55   virtual bool BringSelectedWindowToFront(); | 52   virtual bool BringSelectedWindowToFront() = 0; | 
| 56 |  | 
| 57   // DesktopCapturer interfaces. |  | 
| 58   bool GetSourceList(SourceList* sources) override; |  | 
| 59   bool SelectSource(SourceId id) override; |  | 
| 60   bool FocusOnSelectedSource() override; |  | 
| 61 }; | 53 }; | 
| 62 | 54 | 
| 63 }  // namespace webrtc | 55 }  // namespace webrtc | 
| 64 | 56 | 
| 65 #endif  // WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_H_ | 57 #endif  // WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_H_ | 
| 66 | 58 | 
| OLD | NEW | 
|---|