Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h

Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More Windows reverts Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h
diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h
index a91e7444808507d6891268b5f806d5c3d7e90a4e..17cb0aa1940e3862b33a32be59a002576b8df5a1 100644
--- a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h
+++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h
@@ -11,6 +11,8 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_GDI_H_
+#include <memory>
+
#include "webrtc/modules/desktop_capture/screen_capturer.h"
#include <windows.h>
@@ -54,7 +56,7 @@ class ScreenCapturerWinGdi : public ScreenCapturer {
void CaptureCursor();
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_;
@@ -76,7 +78,7 @@ class ScreenCapturerWinGdi : public ScreenCapturer {
DesktopRect desktop_dc_rect_;
// Class to calculate the difference between two screen bitmaps.
- rtc::scoped_ptr<Differ> differ_;
+ std::unique_ptr<Differ> differ_;
HMODULE dwmapi_library_;
DwmEnableCompositionFunc composition_func_;

Powered by Google App Engine
This is Rietveld 408576698