Remove GetWindowList / GetScreenList and SelectWindow / SelectScreen from WebRTC

webrtc/modules/desktop_capture/window_capturer_win.cc

 /*
  *  Copyright (c) 2013 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/window_capturer.h"
 
 #include <assert.h>
 
 #include <memory>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/win32.h"
 #include "webrtc/modules/desktop_capture/desktop_frame_win.h"
 #include "webrtc/modules/desktop_capture/win/window_capture_utils.h"
 #include "webrtc/system_wrappers/include/logging.h"
 
 namespace webrtc {
 
 namespace {
 
 BOOL CALLBACK WindowsEnumerationHandler(HWND hwnd, LPARAM param) {
-  WindowCapturer::WindowList* list =
-      reinterpret_cast<WindowCapturer::WindowList*>(param);
+  DesktopCapturer::SourceList* list =
+      reinterpret_cast<DesktopCapturer::SourceList*>(param);
 
   // Skip windows that are invisible, minimized, have no title, or are owned,
   // unless they have the app window style set.
   int len = GetWindowTextLength(hwnd);
   HWND owner = GetWindow(hwnd, GW_OWNER);
   LONG exstyle = GetWindowLong(hwnd, GWL_EXSTYLE);
   if (len == 0 || IsIconic(hwnd) || !IsWindowVisible(hwnd) ||
       (owner && !(exstyle & WS_EX_APPWINDOW))) {
     return TRUE;
   }
@@ skipping 14 matching lines @@
   // Windows 8 introduced a "Modern App" identified by their class name being
   // either ApplicationFrameWindow or windows.UI.Core.coreWindow. The
   // associated windows cannot be captured, so we skip them.
   // http://crbug.com/526883.
   if (rtc::IsWindows8OrLater() &&
       (wcscmp(class_name, L"ApplicationFrameWindow") == 0 ||
        wcscmp(class_name, L"Windows.UI.Core.CoreWindow") == 0)) {
     return TRUE;
   }
 
-  WindowCapturer::Window window;
+  DesktopCapturer::Source window;
   window.id = reinterpret_cast<WindowId>(hwnd);
 
   const size_t kTitleLength = 500;
   WCHAR window_title[kTitleLength];
   // Truncate the title if it's longer than kTitleLength.
   GetWindowText(hwnd, window_title, kTitleLength);
   window.title = rtc::ToUtf8(window_title);
 
   // Skip windows when we failed to convert the title or it is empty.
   if (window.title.empty())
     return TRUE;
 
   list->push_back(window);
 
   return TRUE;
 }
 
 class WindowCapturerWin : public WindowCapturer {
  public:
   WindowCapturerWin();
   ~WindowCapturerWin() override;
 
-  // WindowCapturer interface.
-  bool GetWindowList(WindowList* windows) override;
-  bool SelectWindow(WindowId id) override;
-  bool BringSelectedWindowToFront() override;
-
   // DesktopCapturer interface.
   void Start(Callback* callback) override;
   void CaptureFrame() override;
+  bool GetSourceList(SourceList* sources) override;
+  bool SelectSource(SourceId id) override;
+  bool FocusOnSelectedSource() override;
 
  private:
   Callback* callback_ = nullptr;
 
   // HWND and HDC for the currently selected window or nullptr if window is not
   // selected.
   HWND window_ = nullptr;
 
   DesktopSize previous_size_;
 
   AeroChecker aero_checker_;
 
   // This map is used to avoid flickering for the case when SelectWindow() calls
   // are interleaved with Capture() calls.
   std::map<HWND, DesktopSize> window_size_map_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerWin);
 };
 
 WindowCapturerWin::WindowCapturerWin() {}
 WindowCapturerWin::~WindowCapturerWin() {}
 
-bool WindowCapturerWin::GetWindowList(WindowList* windows) {
-  WindowList result;
+bool WindowCapturerWin::GetSourceList(SourceList* sources) {
+  SourceList result;
   LPARAM param = reinterpret_cast<LPARAM>(&result);
   if (!EnumWindows(&WindowsEnumerationHandler, param))
     return false;
-  windows->swap(result);
+  sources->swap(result);
 
   std::map<HWND, DesktopSize> new_map;
-  for (const auto& item : *windows) {
+  for (const auto& item : *sources) {
     HWND hwnd = reinterpret_cast<HWND>(item.id);
     new_map[hwnd] = window_size_map_[hwnd];
   }
   window_size_map_.swap(new_map);
 
   return true;
 }
 
-bool WindowCapturerWin::SelectWindow(WindowId id) {
+bool WindowCapturerWin::SelectSource(SourceId id) {
   HWND window = reinterpret_cast<HWND>(id);
   if (!IsWindow(window) || !IsWindowVisible(window) || IsIconic(window))
     return false;
   window_ = window;
   // When a window is not in the map, window_size_map_[window] will create an
   // item with DesktopSize (0, 0).
   previous_size_ = window_size_map_[window];
   return true;
 }
 
-bool WindowCapturerWin::BringSelectedWindowToFront() {
+bool WindowCapturerWin::FocusOnSelectedSource() {
   if (!window_)
     return false;
 
   if (!IsWindow(window_) || !IsWindowVisible(window_) || IsIconic(window_))
     return false;
 
   return BringWindowToTop(window_) != FALSE &&
          SetForegroundWindow(window_) != FALSE;
 }
 
@@ skipping 113 matching lines @@
   return new WindowCapturerWin();
 }
 
 // static
 std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
     const DesktopCaptureOptions& options) {
   return std::unique_ptr<DesktopCapturer>(new WindowCapturerWin());
 }
 
 }  // namespace webrtc