commit fce4905987d650a3119b1071d42166c8d430d4d3
author zijiehe <zijiehe@chromium.org> Mon Nov 07 23:25:18 2016
committer Commit bot <commit-bot@chromium.org> Mon Nov 07 23:25:22 2016
tree 1d1f5f5ceab4e616f57088a267cd7c2602a1de2e
parent bcc5d87f0932e96efdd90dc7fcc50ebab301ce62

Implement and use new DesktopCapturer APIs in WebRTC

This change replaces all GetWindowList / GetScreenList with GetScreenList,
SelectWindow / SelectScreen with SelectSource, and BringSelectedWindowToFront
with FocusOnSelectedSource in WebRTC.

BUG=webrtc:6513

Review-Url: https://codereview.webrtc.org/2479553006
Cr-Commit-Position: refs/heads/master@{#14960}

webrtc/modules/desktop_capture/desktop_capturer.h

diff --git a/webrtc/modules/desktop_capture/desktop_capturer.h b/webrtc/modules/desktop_capture/desktop_capturer.h
index ecae4cb..71834a9 100644
--- a/webrtc/modules/desktop_capture/desktop_capturer.h
+++ b/webrtc/modules/desktop_capture/desktop_capturer.h
@@ -16,6 +16,7 @@
 
 #include <memory>
 #include <string>
+#include <type_traits>
 #include <vector>
 
 #include "webrtc/modules/desktop_capture/desktop_frame.h"
@@ -59,6 +60,9 @@
 
   typedef intptr_t SourceId;
 
+  static_assert(std::is_same<SourceId, ScreenId>::value,
+                "SourceId should be a same type as ScreenId.");
+
   struct Source {
     // The unique id to represent a Source of current DesktopCapturer.
     SourceId id;