Index: webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h |
diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h |
index 4a037be6918ffc34155e9e3f47040402dbdb6e6f..d5e3946d627524a2b619608643ac8d652f3863cf 100644 |
--- a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h |
+++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h |
@@ -11,6 +11,8 @@ |
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_ |
#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_ |
+#include <memory> |
+ |
#include <windows.h> |
#include <magnification.h> |
#include <wincodec.h> |
@@ -39,7 +41,7 @@ class ScreenCapturerWinMagnifier : public ScreenCapturer { |
// screen is being captured, or the OS does not support Magnification API, or |
// the magnifier capturer fails (e.g. in Windows8 Metro mode). |
explicit ScreenCapturerWinMagnifier( |
- rtc::scoped_ptr<ScreenCapturer> fallback_capturer); |
+ std::unique_ptr<ScreenCapturer> fallback_capturer); |
virtual ~ScreenCapturerWinMagnifier(); |
// Overridden from ScreenCapturer: |
@@ -103,10 +105,10 @@ class ScreenCapturerWinMagnifier : public ScreenCapturer { |
static Atomic32 tls_index_; |
- rtc::scoped_ptr<ScreenCapturer> fallback_capturer_; |
+ std::unique_ptr<ScreenCapturer> fallback_capturer_; |
bool fallback_capturer_started_; |
Callback* callback_; |
- rtc::scoped_ptr<SharedMemoryFactory> shared_memory_factory_; |
+ std::unique_ptr<SharedMemoryFactory> shared_memory_factory_; |
ScreenId current_screen_id_; |
std::wstring current_device_key_; |
HWND excluded_window_; |
@@ -119,7 +121,7 @@ class ScreenCapturerWinMagnifier : public ScreenCapturer { |
ScreenCaptureFrameQueue queue_; |
// Class to calculate the difference between two screen bitmaps. |
- rtc::scoped_ptr<Differ> differ_; |
+ std::unique_ptr<Differ> differ_; |
// Used to suppress duplicate logging of SetThreadExecutionState errors. |
bool set_thread_execution_state_failed_; |