Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

webrtc/modules/desktop_capture/screen_capturer.h

Index: webrtc/modules/desktop_capture/screen_capturer.h
diff --git a/webrtc/modules/desktop_capture/screen_capturer.h b/webrtc/modules/desktop_capture/screen_capturer.h
index 5f07ba1a53318986a6a4af20a2d5730ba05196b8..4435d63ce9c58e01c70443eb66848375a2094e2e 100644
--- a/webrtc/modules/desktop_capture/screen_capturer.h
+++ b/webrtc/modules/desktop_capture/screen_capturer.h
@@ -21,6 +21,7 @@ namespace webrtc {
 
 class DesktopCaptureOptions;
 
+// TODO(zijiehe): Remove this class.
 // Class used to capture video frames asynchronously.
 //
 // The full capture sequence is as follows:
@@ -41,6 +42,8 @@ class DesktopCaptureOptions;
 //    Since data can be read while another capture action is happening.
 class ScreenCapturer : public DesktopCapturer {
  public:
+  typedef webrtc::ScreenId ScreenId;

[Sergey Ulanov, 2016/10/28 23:08:15]

I don't think we need this type

[Hzj_jie, 2016/10/29 00:04:56]

Done.

+
   // Use a struct to represent a screen although it has only an id for now,
   // because we may want to add more fields (e.g. description) in the future.
   struct Screen {
@@ -48,19 +51,25 @@ class ScreenCapturer : public DesktopCapturer {
   };
   typedef std::vector<Screen> ScreenList;
 
-  ~ScreenCapturer() override {}
+  ~ScreenCapturer() override;
 
   // Creates a platform-specific capturer.
   static ScreenCapturer* Create(const DesktopCaptureOptions& options);
 
+  // Deprecated, use GetSourceList().
   // Get the list of screens (not containing kFullDesktopScreenId). Returns
   // false in case of a failure.
-  virtual bool GetScreenList(ScreenList* screens) = 0;
+  virtual bool GetScreenList(ScreenList* screens);
 
+  // Deprecated, use SelectSource().
   // Select the screen to be captured. Returns false in case of a failure (e.g.
   // if there is no screen with the specified id). If this is never called, the
   // full desktop is captured.
-  virtual bool SelectScreen(ScreenId id) = 0;
+  virtual bool SelectScreen(ScreenId id);
+
+  // DesktopCapturer interfaces.
+  bool GetSourceList(SourceList* sources) override;
+  bool SelectSource(SourceId id) override;
 };
 
 }  // namespace webrtc