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

Unified Diff: webrtc/modules/desktop_capture/desktop_frame_win.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/desktop_frame_win.h
diff --git a/webrtc/modules/desktop_capture/desktop_frame_win.h b/webrtc/modules/desktop_capture/desktop_frame_win.h
index fffaeab54e3fb098a1e34e924d882ae9144a78c2..929d23c0e56af6fcef478aadf62877ab64f9b150 100644
--- a/webrtc/modules/desktop_capture/desktop_frame_win.h
+++ b/webrtc/modules/desktop_capture/desktop_frame_win.h
@@ -11,9 +11,10 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_WIN_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_WIN_H_
+#include <memory>
+
#include <windows.h>
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/desktop_capture/desktop_frame.h"
#include "webrtc/typedefs.h"
@@ -34,11 +35,11 @@ class DesktopFrameWin : public DesktopFrame {
DesktopFrameWin(DesktopSize size,
int stride,
uint8_t* data,
- rtc::scoped_ptr<SharedMemory> shared_memory,
+ std::unique_ptr<SharedMemory> shared_memory,
HBITMAP bitmap);
HBITMAP bitmap_;
- rtc::scoped_ptr<SharedMemory> owned_shared_memory_;
+ std::unique_ptr<SharedMemory> owned_shared_memory_;
RTC_DISALLOW_COPY_AND_ASSIGN(DesktopFrameWin);
};

Powered by Google App Engine
This is Rietveld 408576698