| Index: webrtc/base/window.h
|
| diff --git a/webrtc/base/window.h b/webrtc/base/window.h
|
| index a4a9aa446561500c2bb3eec44322be3817586229..d515f7c829393434f690907eda42ce87ce3f55f0 100644
|
| --- a/webrtc/base/window.h
|
| +++ b/webrtc/base/window.h
|
| @@ -11,68 +11,9 @@
|
| #ifndef WEBRTC_BASE_WINDOW_H_
|
| #define WEBRTC_BASE_WINDOW_H_
|
|
|
| -#include <stdint.h>
|
|
|
| -#include "webrtc/base/stringencode.h"
|
| -
|
| -// Define platform specific window types.
|
| -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
|
| -typedef unsigned long Window; // Avoid include <X11/Xlib.h>.
|
| -#elif defined(WEBRTC_WIN)
|
| -// We commonly include win32.h in webrtc/base so just include it here.
|
| -#include "webrtc/base/win32.h" // Include HWND, HMONITOR.
|
| -#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
|
| -typedef unsigned int CGWindowID;
|
| -typedef unsigned int CGDirectDisplayID;
|
| -#endif
|
| -
|
| -namespace rtc {
|
| -
|
| -class WindowId {
|
| - public:
|
| - // Define WindowT for each platform.
|
| -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
|
| - typedef Window WindowT;
|
| -#elif defined(WEBRTC_WIN)
|
| - typedef HWND WindowT;
|
| -#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
|
| - typedef CGWindowID WindowT;
|
| -#else
|
| - typedef unsigned int WindowT;
|
| -#endif
|
| -
|
| - static WindowId Cast(uint64_t id) {
|
| -#if defined(WEBRTC_WIN)
|
| - return WindowId(reinterpret_cast<WindowId::WindowT>(id));
|
| -#else
|
| - return WindowId(static_cast<WindowId::WindowT>(id));
|
| -#endif
|
| - }
|
| -
|
| - static uint64_t Format(const WindowT& id) {
|
| -#if defined(WEBRTC_WIN)
|
| - return static_cast<uint64_t>(reinterpret_cast<uintptr_t>(id));
|
| -#else
|
| - return static_cast<uint64_t>(id);
|
| -#endif
|
| - }
|
| -
|
| - WindowId() : id_(0) {}
|
| - WindowId(const WindowT& id) : id_(id) {} // NOLINT
|
| - const WindowT& id() const { return id_; }
|
| - bool IsValid() const { return id_ != 0; }
|
| - bool Equals(const WindowId& other) const {
|
| - return id_ == other.id();
|
| - }
|
| -
|
| - private:
|
| - WindowT id_;
|
| -};
|
| -
|
| -inline std::string ToString(const WindowId& window) {
|
| - return ToString(window.id());
|
| -}
|
| -
|
| -} // namespace rtc
|
| +// This header is deprecated and is just left here temporarily during
|
| +// refactoring. See https://bugs.webrtc.org/7634 for more details.
|
| +#include "webrtc/rtc_base/window.h"
|
|
|
| #endif // WEBRTC_BASE_WINDOW_H_
|
|
|