Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

webrtc/modules/desktop_capture/desktop_capturer.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
 
 #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
-#include "webrtc/modules/desktop_capture/screen_capturer_differ_wrapper.h"
+#include "webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.h"
 
 namespace webrtc {
 
 DesktopCapturer::~DesktopCapturer() = default;
 
 void DesktopCapturer::SetSharedMemoryFactory(
     std::unique_ptr<SharedMemoryFactory> shared_memory_factory) {}
 
 void DesktopCapturer::SetExcludedWindow(WindowId window) {}
 
 bool DesktopCapturer::GetSourceList(SourceList* sources) {
   return true;
 }
 
 bool DesktopCapturer::SelectSource(SourceId id) {
   return false;
 }
 
 bool DesktopCapturer::FocusOnSelectedSource() {
   return false;
 }
 
+#if defined(RTC_DESKTOP_CAPTURE_SUPPORTED)

[Sergey Ulanov, 2016/11/01 20:33:31]

Ideally this file shouldn't be compiled at all when desktop capture is not
supported. But desktop_capture module is compiled on android anywhere because we
have capturer implementations for android in chromium. Please add a comment to
explain what happens here

[Hzj_jie, 2016/11/01 21:12:13]

Is there any reason we put AuraDesktopCapturer for Chrome OS in Chromium instead
of WebRTC?

+// static
+std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateWindowCapturer(
+    const DesktopCaptureOptions& options) {
+  std::unique_ptr<DesktopCapturer> capturer = CreateRawWindowCapturer(options);
+  if (options.detect_updated_region()) {
+    capturer.reset(new DesktopCapturerDifferWrapper(std::move(capturer)));
+  }
+
+  return capturer;
+}
+
+// static
+std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateScreenCapturer(
+    const DesktopCaptureOptions& options) {
+  std::unique_ptr<DesktopCapturer> capturer = CreateRawScreenCapturer(options);
+  if (options.detect_updated_region()) {
+    capturer.reset(new DesktopCapturerDifferWrapper(std::move(capturer)));
+  }
+
+  return capturer;
+}
+#endif

[Sergey Ulanov, 2016/11/01 20:33:31]

 //  defined(RTC_DESKTOP_CAPTURE_SUPPORTED)

[Hzj_jie, 2016/11/01 21:12:13]

Done.

+
 }  // namespace webrtc