| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2010 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2010 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_BASE_LINUXWINDOWPICKER_H_ | 11 #ifndef WEBRTC_BASE_LINUXWINDOWPICKER_H_ |
| 12 #define WEBRTC_BASE_LINUXWINDOWPICKER_H_ | 12 #define WEBRTC_BASE_LINUXWINDOWPICKER_H_ |
| 13 | 13 |
| 14 #include <memory> |
| 15 |
| 14 #include "webrtc/base/basictypes.h" | 16 #include "webrtc/base/basictypes.h" |
| 15 #include "webrtc/base/scoped_ptr.h" | |
| 16 #include "webrtc/base/windowpicker.h" | 17 #include "webrtc/base/windowpicker.h" |
| 17 | 18 |
| 18 // Avoid include <X11/Xlib.h>. | 19 // Avoid include <X11/Xlib.h>. |
| 19 struct _XDisplay; | 20 struct _XDisplay; |
| 20 typedef unsigned long Window; | 21 typedef unsigned long Window; |
| 21 | 22 |
| 22 namespace rtc { | 23 namespace rtc { |
| 23 | 24 |
| 24 class XWindowEnumerator; | 25 class XWindowEnumerator; |
| 25 | 26 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 37 bool GetDesktopList(DesktopDescriptionList* descriptions) override; | 38 bool GetDesktopList(DesktopDescriptionList* descriptions) override; |
| 38 bool GetDesktopDimensions(const DesktopId& id, | 39 bool GetDesktopDimensions(const DesktopId& id, |
| 39 int* width, | 40 int* width, |
| 40 int* height) override; | 41 int* height) override; |
| 41 uint8_t* GetWindowIcon(const WindowId& id, int* width, int* height); | 42 uint8_t* GetWindowIcon(const WindowId& id, int* width, int* height); |
| 42 uint8_t* GetWindowThumbnail(const WindowId& id, int width, int height); | 43 uint8_t* GetWindowThumbnail(const WindowId& id, int width, int height); |
| 43 int GetNumDesktops(); | 44 int GetNumDesktops(); |
| 44 uint8_t* GetDesktopThumbnail(const DesktopId& id, int width, int height); | 45 uint8_t* GetDesktopThumbnail(const DesktopId& id, int width, int height); |
| 45 | 46 |
| 46 private: | 47 private: |
| 47 scoped_ptr<XWindowEnumerator> enumerator_; | 48 std::unique_ptr<XWindowEnumerator> enumerator_; |
| 48 }; | 49 }; |
| 49 | 50 |
| 50 } // namespace rtc | 51 } // namespace rtc |
| 51 | 52 |
| 52 #endif // WEBRTC_BASE_LINUXWINDOWPICKER_H_ | 53 #endif // WEBRTC_BASE_LINUXWINDOWPICKER_H_ |
| OLD | NEW |