Index: webrtc/base/window.h |
diff --git a/webrtc/base/window.h b/webrtc/base/window.h |
index e5b5d5088212b969641474f9e332237860fc6856..a4a9aa446561500c2bb3eec44322be3817586229 100644 |
--- a/webrtc/base/window.h |
+++ b/webrtc/base/window.h |
@@ -69,54 +69,6 @@ class WindowId { |
WindowT id_; |
}; |
-class DesktopId { |
- public: |
- // Define DesktopT for each platform. |
-#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) |
- typedef Window DesktopT; |
-#elif defined(WEBRTC_WIN) |
- typedef HMONITOR DesktopT; |
-#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) |
- typedef CGDirectDisplayID DesktopT; |
-#else |
- typedef unsigned int DesktopT; |
-#endif |
- |
- static DesktopId Cast(int id, int index) { |
-#if defined(WEBRTC_WIN) |
- return DesktopId(reinterpret_cast<DesktopId::DesktopT>(id), index); |
-#else |
- return DesktopId(static_cast<DesktopId::DesktopT>(id), index); |
-#endif |
- } |
- |
- DesktopId() : id_(0), index_(-1) {} |
- DesktopId(const DesktopT& id, int index) // NOLINT |
- : id_(id), index_(index) { |
- } |
- const DesktopT& id() const { return id_; } |
- int index() const { return index_; } |
- bool IsValid() const { return index_ != -1; } |
- bool Equals(const DesktopId& other) const { |
- return id_ == other.id() && index_ == other.index(); |
- } |
- |
- private: |
- // Id is the platform specific desktop identifier. |
- DesktopT id_; |
- // Index is the desktop index as enumerated by each platform. |
- // Desktop capturer typically takes the index instead of id. |
- int index_; |
-}; |
- |
-// Window event types. |
-enum WindowEvent { |
- WE_RESIZE = 0, |
- WE_CLOSE = 1, |
- WE_MINIMIZE = 2, |
- WE_RESTORE = 3, |
-}; |
- |
inline std::string ToString(const WindowId& window) { |
return ToString(window.id()); |
} |